Skip to content

Commit a7f44b9

Browse files
oldnewthingoldnewthing
committed
Windows 10 1511 Release - June 2016 Update 2
2 parents 5a30499 + 99c24d0 commit a7f44b9

File tree

76 files changed

+7081
-947
lines changed

Some content is hidden

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

76 files changed

+7081
-947
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ For additional Windows samples, see [Windows on GitHub](http://microsoft.github.
397397
<table>
398398
<tr>
399399
<td><a href="Samples/HolographicSpatialMapping">Holographic spatial mapping</a></td>
400+
<td><a href="Samples/HolographicTagAlong">Tag-along hologram</a></td>
400401
</tr>
401402
</table>
402403

‎Samples/BluetoothAdvertisement/js/js/scenario3_BackgroundWatcher.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@
183183
taskRegistration.addEventListener("completed", onBackgroundTaskCompleted, false);
184184

185185
// Even though the trigger is registered successfully, it might be blocked. Notify the user if that is the case.
186-
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Denied) ||
187-
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Unspecified)) {
186+
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.denied) ||
187+
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.unspecified)) {
188188
WinJS.log && WinJS.log("Not able to run in background. Application must given permission to be added to lock screen.",
189189
"sample", "error");
190190
}

‎Samples/BluetoothAdvertisement/js/js/scenario4_BackgroundPublisher.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@
159159
taskRegistration.addEventListener("completed", onBackgroundTaskCompleted, false);
160160

161161
// Even though the trigger is registered successfully, it might be blocked. Notify the user if that is the case.
162-
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Denied) ||
163-
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.Unspecified)) {
162+
if ((backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.denied) ||
163+
(backgroundAccessStatus == Windows.ApplicationModel.Background.BackgroundAccessStatus.unspecified)) {
164164
WinJS.log && WinJS.log("Not able to run in background. Application must given permission to be added to lock screen.",
165165
"sample", "error");
166166
}

‎Samples/D2DGradientMesh/cpp/D2DGradientMesh.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
</PropertyGroup>
106106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
107107
<Link>
108-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
108+
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
109109
</Link>
110110
<ClCompile>
111111
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -117,7 +117,7 @@
117117
</ItemDefinitionGroup>
118118
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
119119
<Link>
120-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
120+
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
121121
</Link>
122122
<ClCompile>
123123
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -129,7 +129,7 @@
129129
</ItemDefinitionGroup>
130130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
131131
<Link>
132-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
132+
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
133133
</Link>
134134
<ClCompile>
135135
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -141,7 +141,7 @@
141141
</ItemDefinitionGroup>
142142
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
143143
<Link>
144-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
144+
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
145145
</Link>
146146
<ClCompile>
147147
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -153,7 +153,7 @@
153153
</ItemDefinitionGroup>
154154
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
155155
<Link>
156-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
156+
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
157157
</Link>
158158
<ClCompile>
159159
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -165,7 +165,7 @@
165165
</ItemDefinitionGroup>
166166
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
167167
<Link>
168-
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; ole32.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
168+
<AdditionalDependencies>d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies)</AdditionalDependencies>
169169
</Link>
170170
<ClCompile>
171171
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎Samples/FileAccess/cpp/Scenario1_CreateAFileInThePicturesLibrary.xaml.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ Scenario1::Scenario1() : rootPage(MainPage::Current)
2828

2929
void Scenario1::CreateFileButton_Click(Object^ sender, RoutedEventArgs^ e)
3030
{
31-
create_task(KnownFolders::GetFolderForUserAsync(nullptr /* current user */, KnownFolderId::PicturesLibrary)).then([this](StorageFolder^ picturesFolder)
31+
create_task(KnownFolders::GetFolderForUserAsync(nullptr /* current user */, KnownFolderId::PicturesLibrary))
32+
.then([this](StorageFolder^ picturesFolder)
33+
{
3234
return picturesFolder->CreateFileAsync(rootPage->Filename, CreationCollisionOption::ReplaceExisting);
3335
}).then([this](task<StorageFile^> task)
3436
{

‎Samples/Geotag/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
# Geotag sample
77

8-
This sample demonstrates Windows.Storage.FileProperties.GeotagHelper API usage
8+
This sample demonstrates the GeotagHelper runtime class.
99

10-
Specifically, this sample covers:
11-
12-
Scenario 1: Demonstrates using GetGeotagAsync API to retrieve location info from a file.
13-
Also demostrates using SetGeotagAsync API to geotag a file with known location
14-
info, and using SetGeotagFromGeolocatorAsync API to geotag a file with current
15-
device location info provided by location framework.
10+
- Read geotag information from a file.
11+
- Set a file's geotag information to a specific location.
12+
- Set a file's geotag information to the location obtained from a Geolocator.
1613

1714
Related topics
1815
--------------
19-
[Known Folders](https://msdn.microsoft.com/library/windows/apps/windows.storage.knownfolders.aspx)
16+
[GeotagHelper class](https://msdn.microsoft.com/library/windows/apps/windows.storage.fileproperties.geotaghelper.aspx)
17+
18+
[Geolocator class](https://msdn.microsoft.com/library/windows/apps/windows.devices.geolocation.geolocator.aspx)
2019

20+
[Geolocation sample](/Samples/Geolocation)
2121

2222
System requirements
2323
-------------------

‎Samples/Geotag/cpp/Geotag.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
</ClInclude>
150150
<ClInclude Include="SampleConfiguration.h" />
151151
<ClInclude Include="Scenario1_Geotag.xaml.h">
152-
<DependentUpon>Scenario1_Geotag.xaml</DependentUpon>
152+
<DependentUpon>..\shared\Scenario1_Geotag.xaml</DependentUpon>
153153
</ClInclude>
154154
</ItemGroup>
155155
<ItemGroup>
@@ -159,7 +159,7 @@
159159
<Page Include="..\..\..\SharedContent\cpp\MainPage.xaml">
160160
<SubType>Designer</SubType>
161161
</Page>
162-
<Page Include="Scenario1_Geotag.xaml" />
162+
<Page Include="..\shared\Scenario1_Geotag.xaml" />
163163
<Page Include="..\..\..\SharedContent\xaml\Styles.xaml">
164164
<Link>Styles\Styles.xaml</Link>
165165
</Page>
@@ -186,7 +186,7 @@
186186
</ClCompile>
187187
<ClCompile Include="SampleConfiguration.cpp" />
188188
<ClCompile Include="Scenario1_Geotag.xaml.cpp">
189-
<DependentUpon>Scenario1_Geotag.xaml</DependentUpon>
189+
<DependentUpon>..\shared\Scenario1_Geotag.xaml</DependentUpon>
190190
</ClCompile>
191191
</ItemGroup>
192192
<ItemGroup>

‎Samples/Geotag/cpp/Geotag.vcxproj.filters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</ItemGroup>
4646
<ItemGroup>
4747
<Page Include="..\..\..\SharedContent\cpp\MainPage.xaml" />
48-
<Page Include="Scenario1_Geotag.xaml" />
48+
<Page Include="..\shared\Scenario1_Geotag.xaml" />
4949
<Page Include="..\..\..\SharedContent\xaml\Styles.xaml">
5050
<Filter>Styles</Filter>
5151
</Page>

‎Samples/Geotag/cpp/SampleConfiguration.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ using namespace SDKTemplate;
88

99
Platform::Array<Scenario>^ MainPage::scenariosInner = ref new Platform::Array<Scenario>
1010
{
11-
{ "Geotag CPP Sample", "GeotagCPPSample.Scenario1_Geotag" }
11+
{ "Geotag a file", "SDKTemplate.Scenario1_Geotag" }
1212
};

‎Samples/Geotag/cpp/Scenario1_Geotag.xaml‎

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

0 commit comments

Comments
 (0)