Skip to content

Commit de1bb52

Browse files
oldnewthingoldnewthing
committed
Windows 10 Version 1709 - May 2018 Update
1 parent f6ad9bc commit de1bb52

File tree

120 files changed

+6554
-461
lines changed

Some content is hidden

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

120 files changed

+6554
-461
lines changed

‎README.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,35 +93,36 @@ For additional Windows samples, see [Windows on GitHub](http://microsoft.github.
9393
</tr>
9494
<tr>
9595
<td><a href="Samples/CameraResolution">Camera resolution</a></td>
96+
<td><a href="Samples/CameraStreamCoordinateMapper">Camera stream coordinate mapper</a></td>
9697
<td><a href="Samples/CameraStreamCorrelation">Camera stream correlation</a></td>
97-
<td><a href="Samples/LiveDash">DASH streaming</a></td>
9898
</tr>
9999
<tr>
100+
<td><a href="Samples/LiveDash">DASH streaming</a></td>
100101
<td><a href="Samples/D2DPhotoAdjustment">Direct2D photo adjustment</a></td>
101102
<td><a href="Samples/MediaEditing">Media editing</a></td>
102-
<td><a href="Samples/MediaImport">Media import</a></td>
103103
</tr>
104104
<tr>
105+
<td><a href="Samples/MediaImport">Media import</a></td>
105106
<td><a href="Samples/XamlCustomMediaTransportControls">Media transport controls</a></td>
106107
<td><a href="Samples/MIDI">MIDI</a></td>
107-
<td><a href="Samples/Playlists">Playlists</a></td>
108108
</tr>
109109
<tr>
110+
<td><a href="Samples/Playlists">Playlists</a></td>
110111
<td><a href="Samples/PlayReady">PlayReady</a></td>
111112
<td><a href="Samples/CameraOpenCV">Processing frames with OpenCV</a></td>
112-
<td><a href="Samples/SimpleImaging">Simple imaging</a></td>
113113
</tr>
114114
<tr>
115+
<td><a href="Samples/SimpleImaging">Simple imaging</a></td>
115116
<td><a href="Samples/SpatialSound">Spatial audio</a></td>
116117
<td><a href="Samples/SystemMediaTransportControls">System media transport controls</a></td>
117-
<td><a href="Samples/MediaTranscoding">Transcoding media</a></td>
118118
</tr>
119119
<tr>
120+
<td><a href="Samples/MediaTranscoding">Transcoding media</a></td>
120121
<td><a href="Samples/VideoPlayback">Video playback</a></td>
121122
<td><a href="Samples/VideoPlaybackSynchronization">Video playback synchronization</a></td>
122-
<td><a href="Samples/CameraVideoStabilization">Video stabilization</a></td>
123123
</tr>
124124
<tr>
125+
<td><a href="Samples/CameraVideoStabilization">Video stabilization</a></td>
125126
<td><a href="Samples/WindowsAudioSession">Windows audio session (WASAPI)</a></td>
126127
</tr>
127128
</table>
@@ -284,6 +285,7 @@ For additional Windows samples, see [Windows on GitHub](http://microsoft.github.
284285
<tr>
285286
<td><a href="Samples/ShareSource">Sharing content source app</a></td>
286287
<td><a href="Samples/ShareTarget">Sharing content target app</a></td>
288+
<td><a href="Samples/UserActivity">User activities</a></td>
287289
</tr>
288290
</table>
289291

‎Samples/360VideoPlayback/cpp/Common/DeviceResources.cpp‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -361,25 +361,6 @@ void DX::DeviceResources::Present(HolographicFrame^ frame)
361361
// holographic frame predictions.
362362
HolographicFramePresentResult presentResult = frame->PresentUsingCurrentPrediction();
363363

364-
HolographicFramePrediction^ prediction = frame->CurrentPrediction;
365-
UseHolographicCameraResources<void>([this, prediction](std::map<UINT32, std::unique_ptr<CameraResources>>& cameraResourceMap)
366-
{
367-
for (auto cameraPose : prediction->CameraPoses)
368-
{
369-
// This represents the device-based resources for a HolographicCamera.
370-
DX::CameraResources* pCameraResources = cameraResourceMap[cameraPose->HolographicCamera->Id].get();
371-
372-
// Discard the contents of the render target.
373-
// This is a valid operation only when the existing contents will be
374-
// entirely overwritten. If dirty or scroll rects are used, this call
375-
// should be removed.
376-
m_d3dContext->DiscardView(pCameraResources->GetBackBufferRenderTargetView());
377-
378-
// Discard the contents of the depth stencil.
379-
m_d3dContext->DiscardView(pCameraResources->GetDepthStencilView());
380-
}
381-
});
382-
383364
// The PresentUsingCurrentPrediction API will detect when the graphics device
384365
// changes or becomes invalid. When this happens, it is considered a Direct3D
385366
// device lost scenario.

‎Samples/360VideoPlayback/cs/Common/DeviceResources.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -363,25 +363,6 @@ public void Present(ref HolographicFrame frame)
363363
HolographicFramePresentWaitBehavior.WaitForFrameToFinish
364364
);
365365

366-
HolographicFramePrediction prediction = frame.CurrentPrediction;
367-
UseHolographicCameraResources((Dictionary<uint, CameraResources> cameraResourcesDictionary) =>
368-
{
369-
foreach (var cameraPose in prediction.CameraPoses)
370-
{
371-
// This represents the device-based resources for a HolographicCamera.
372-
CameraResources cameraResources = cameraResourcesDictionary[cameraPose.HolographicCamera.Id];
373-
374-
// Discard the contents of the render target.
375-
// This is a valid operation only when the existing contents will be
376-
// entirely overwritten. If dirty or scroll rects are used, this call
377-
// should be removed.
378-
d3dContext.DiscardView(cameraResources.BackBufferRenderTargetView);
379-
380-
// Discard the contents of the depth stencil.
381-
d3dContext.DiscardView(cameraResources.DepthStencilView);
382-
}
383-
});
384-
385366
// The PresentUsingCurrentPrediction API will detect when the graphics device
386367
// changes or becomes invalid. When this happens, it is considered a Direct3D
387368
// device lost scenario.

‎Samples/360VideoPlayback/cs/ms.fxcompile.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@
154154
</ItemGroup>
155155

156156
<PropertyGroup>
157-
<FXCPath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\x86</FXCPath>
157+
<FXCPath Condition="Exists('$(MSBuildProgramFiles32)\Windows Kits\10\bin\$(TargetPlatformVersion)\x86\fxc.exe')">$(MSBuildProgramFiles32)\Windows Kits\10\bin\$(TargetPlatformVersion)\x86</FXCPath>
158+
<FXCPath Condition="'$(FXCPath)' == ''">$(MSBuildProgramFiles32)\Windows Kits\10\bin\x86</FXCPath>
158159
</PropertyGroup>
159160

160161
<Message Text="Using 'fxc.exe' from '$(FXCPath)'." />

‎Samples/Advertising/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ Specifically, this sample shows how to:
2222

2323
## Prerequisites
2424

25-
This sample requires the [Microsoft Advertising SDK Libraries for XAML or JavaScript](http://go.microsoft.com/fwlink/?LinkID=619694).
26-
[Download it here](http://go.microsoft.com/fwlink/p/?LinkId=518026).
25+
This sample requires the [Microsoft Advertising SDK Libraries for XAML or JavaScript](http://go.microsoft.com/fwlink/?LinkID=619694),
26+
which is obtained via NuGet package,
27+
or you can [download it here](http://go.microsoft.com/fwlink/p/?LinkId=518026).
2728
It also requires the [internet client capability](https://msdn.microsoft.com/library/windows/apps/mt270968#general-use_capabilities) to be added to the manifest.
2829

2930
When you incorporate this sample into your own app,

‎Samples/Advertising/cpp/Advertising.vcxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,17 @@
222222
<ItemGroup>
223223
<SDKReference Include="Microsoft.Advertising.Xaml, Version=10.0" />
224224
</ItemGroup>
225+
<ItemGroup>
226+
<None Include="packages.config" />
227+
</ItemGroup>
225228
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
226229
<ImportGroup Label="ExtensionTargets">
230+
<Import Project="packages\Microsoft.Advertising.XAML.10.1705.16001\build\Microsoft.Advertising.XAML.targets" Condition="Exists('packages\Microsoft.Advertising.XAML.10.1705.16001\build\Microsoft.Advertising.XAML.targets')" />
227231
</ImportGroup>
232+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
233+
<PropertyGroup>
234+
<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>
235+
</PropertyGroup>
236+
<Error Condition="!Exists('packages\Microsoft.Advertising.XAML.10.1705.16001\build\Microsoft.Advertising.XAML.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Advertising.XAML.10.1705.16001\build\Microsoft.Advertising.XAML.targets'))" />
237+
</Target>
228238
</Project>

‎Samples/Advertising/cpp/Advertising.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,7 @@
6565
<Filter>Assets</Filter>
6666
</Image>
6767
</ItemGroup>
68+
<ItemGroup>
69+
<None Include="packages.config" />
70+
</ItemGroup>
6871
</Project>

‎Samples/Advertising/cpp/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.Advertising.XAML" version="10.1705.16001" targetFramework="native" />
4+
</packages>

‎Samples/Advertising/cs/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"dependencies": {
3+
"Microsoft.Advertising.XAML": "10.1705.16001",
34
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
45
},
56
"frameworks": {
6-
"uap10.0": {}
7+
"uap10.0.16299": {}
78
},
89
"runtimes": {
910
"win10-arm": {},

‎Samples/Advertising/js/Advertising.jsproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|AnyCPU">
5-
<Configuration>Debug</Configuration>
6-
<Platform>AnyCPU</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|ARM">
95
<Configuration>Debug</Configuration>
106
<Platform>ARM</Platform>
@@ -17,10 +13,6 @@
1713
<Configuration>Debug</Configuration>
1814
<Platform>x86</Platform>
1915
</ProjectConfiguration>
20-
<ProjectConfiguration Include="Release|AnyCPU">
21-
<Configuration>Release</Configuration>
22-
<Platform>AnyCPU</Platform>
23-
</ProjectConfiguration>
2416
<ProjectConfiguration Include="Release|ARM">
2517
<Configuration>Release</Configuration>
2618
<Platform>ARM</Platform>
@@ -127,12 +119,20 @@
127119
<Content Include="..\..\..\SharedContent\js\sample-utils\scenario-select.html">
128120
<Link>sample-utils\scenario-select.html</Link>
129121
</Content>
122+
<Content Include="packages.config" />
130123
</ItemGroup>
131124
<ItemGroup>
132125
<SDKReference Include="Microsoft.Advertising.JavaScript, Version=10.0" />
133126
<SDKReference Include="Microsoft.VCLibs, Version=14.0" />
134127
</ItemGroup>
135128
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
129+
<Import Project="packages\Microsoft.Advertising.JS.10.1705.16001\build\Microsoft.Advertising.JS.targets" Condition="Exists('packages\Microsoft.Advertising.JS.10.1705.16001\build\Microsoft.Advertising.JS.targets')" />
130+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131+
<PropertyGroup>
132+
<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>
133+
</PropertyGroup>
134+
<Error Condition="!Exists('packages\Microsoft.Advertising.JS.10.1705.16001\build\Microsoft.Advertising.JS.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Advertising.JS.10.1705.16001\build\Microsoft.Advertising.JS.targets'))" />
135+
</Target>
136136
<!-- To modify your build process, add your task inside one of the targets below then uncomment
137137
that target and the DisableFastUpToDateCheck PropertyGroup.
138138
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)