Skip to content

Commit e265cc4

Browse files
committed
Upgrade samples to Visual Studio 2019.
1 parent b9b44e3 commit e265cc4

File tree

925 files changed

+12828
-9721
lines changed

Some content is hidden

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

925 files changed

+12828
-9721
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ This repo contains the samples that demonstrate the API usage patterns for the U
1414
1515
## Universal Windows Platform development
1616

17-
These samples require Visual Studio 2017 Update 4 or higher and the Windows Software Development Kit (SDK) version 17134 for Windows 10.
17+
These samples require Visual Studio and the Windows Software Development Kit (SDK) for Windows 10.
1818

19-
[Get a free copy of Visual Studio 2017 Community Edition with support for building Universal Windows Platform apps](http://go.microsoft.com/fwlink/p/?LinkID=280676)
19+
[Get a free copy of Visual Studio Community Edition with support for building Universal Windows Platform apps](http://go.microsoft.com/fwlink/p/?LinkID=280676)
2020

2121
Additionally, to stay on top of the latest updates to Windows and the development tools, become a Windows Insider by joining the Windows Insider Program.
2222

2323
[Become a Windows Insider](https://insider.windows.com/)
2424

2525
## Using the samples
2626

27-
The easiest way to use these samples without using Git is to download the zip file containing the current version (using the following link or by clicking the "Download ZIP" button on the repo page). You can then unzip the entire archive and use the samples in Visual Studio 2017.
27+
The easiest way to use these samples without using Git is to download the zip file containing the current version (using the following link or by clicking the "Download ZIP" button on the repo page). You can then unzip the entire archive and use the samples in Visual Studio.
2828

2929
[Download the samples ZIP](../../archive/master.zip)
3030

3131
**Notes:**
3232
* Before you unzip the archive, right-click it, select **Properties**, and then select **Unblock**.
3333
* Be sure to unzip the entire archive, and not just individual samples. The samples all depend on the SharedContent folder in the archive.
34-
* In Visual Studio 2017, the platform target defaults to ARM, so be sure to change that to x64 or x86 if you want to test on a non-ARM device.
34+
* In Visual Studio, the platform target defaults to ARM, so be sure to change that to x64 or x86 if you want to test on a non-ARM device.
3535

3636
The samples use Linked files in Visual Studio to reduce duplication of common files, including sample template files and image assets. These common files are stored in the SharedContent folder at the root of the repository, and are referred to in the project files using links.
3737

Samples/360VideoPlayback/README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
---
2-
topic: sample
2+
page_type: sample
33
languages:
44
- csharp
55
- cpp
66
- cppcx
77
products:
88
- windows
99
- windows-uwp
10+
urlFragment: 360VideoPlayback
11+
extendedZipContent:
12+
- path: SharedContent
13+
target: SharedContent
14+
- path: LICENSE
15+
target: LICENSE
16+
description: "Shows how to play 360-degree video."
1017
---
1118

1219
<!---
@@ -41,7 +48,7 @@ Specifically, this samples covers:
4148

4249
## Additional remarks
4350

44-
**Note** The Windows universal samples for Windows 10 Holographic require Visual Studio 2017 Update 2
51+
**Note** The Windows universal samples for Windows 10 Holographic require Visual Studio
4552
to build, and a Windows Holographic device to execute. Windows Holographic devices include the
4653
Microsoft HoloLens and the Microsoft HoloLens Emulator.
4754

@@ -68,7 +75,7 @@ Visual Studio and the Microsoft HoloLens Emulator, go to
6875

6976
1. If you download the samples ZIP, be sure to unzip the entire archive, not just the folder with
7077
the sample you want to build.
71-
2. Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
78+
2. Start Microsoft Visual Studio and select **File** \> **Open** \> **Project/Solution**.
7279
3. Starting in the folder where you unzipped the samples, go to the Samples subfolder, then the
7380
subfolder for this specific sample, then the subfolder for your preferred language (C++, C#, or
7481
JavaScript). Double-click the Visual Studio Solution (.sln) file.

Samples/360VideoPlayback/cpp/360VideoPlayback.vcxproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SharedContentDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), LICENSE))\SharedContent</SharedContentDir>
5+
</PropertyGroup>
36
<PropertyGroup Label="Globals">
47
<ProjectGuid>{3645d95d-4504-556a-bc4f-e8f1da5ddad1}</ProjectGuid>
58
<Keyword>HolographicApp</Keyword>
@@ -74,7 +77,7 @@
7477
</ImportGroup>
7578
<PropertyGroup Label="UserMacros" />
7679
<PropertyGroup>
77-
<IncludePath>$(VC_IncludePath);$(UniversalCRT_IncludePath);$(WindowsSDK_IncludePath);..\..\..\SharedContent\cpp</IncludePath>
80+
<IncludePath>$(VC_IncludePath);$(UniversalCRT_IncludePath);$(WindowsSDK_IncludePath);$(SharedContentDir)\cpp</IncludePath>
7881
</PropertyGroup>
7982
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8083
<Link>
@@ -133,16 +136,16 @@
133136
</ClCompile>
134137
</ItemDefinitionGroup>
135138
<ItemGroup>
136-
<Image Include="..\..\..\SharedContent\media\splash-sdk.png">
139+
<Image Include="$(SharedContentDir)\media\splash-sdk.png">
137140
<Link>Assets\splash-sdk.png</Link>
138141
</Image>
139-
<Image Include="..\..\..\SharedContent\media\squaretile-sdk.png">
142+
<Image Include="$(SharedContentDir)\media\squaretile-sdk.png">
140143
<Link>Assets\squareTile-sdk.png</Link>
141144
</Image>
142-
<Image Include="..\..\..\SharedContent\media\smalltile-sdk.png">
145+
<Image Include="$(SharedContentDir)\media\smalltile-sdk.png">
143146
<Link>Assets\smallTile-sdk.png</Link>
144147
</Image>
145-
<Image Include="..\..\..\SharedContent\media\storelogo-sdk.png">
148+
<Image Include="$(SharedContentDir)\media\storelogo-sdk.png">
146149
<Link>Assets\StoreLogo-sdk.png</Link>
147150
</Image>
148151
</ItemGroup>

Samples/360VideoPlayback/cpp/360VideoPlayback.vcxproj.filters

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,16 @@
129129
<AppxManifest Include="Package.appxmanifest" />
130130
</ItemGroup>
131131
<ItemGroup>
132-
<Image Include="..\..\..\SharedContent\media\splash-sdk.png">
132+
<Image Include="$(SharedContentDir)\media\splash-sdk.png">
133133
<Filter>Assets</Filter>
134134
</Image>
135-
<Image Include="..\..\..\SharedContent\media\squaretile-sdk.png">
135+
<Image Include="$(SharedContentDir)\media\squaretile-sdk.png">
136136
<Filter>Assets</Filter>
137137
</Image>
138-
<Image Include="..\..\..\SharedContent\media\smalltile-sdk.png">
138+
<Image Include="$(SharedContentDir)\media\smalltile-sdk.png">
139139
<Filter>Assets</Filter>
140140
</Image>
141-
<Image Include="..\..\..\SharedContent\media\storelogo-sdk.png">
141+
<Image Include="$(SharedContentDir)\media\storelogo-sdk.png">
142142
<Filter>Assets</Filter>
143143
</Image>
144144
</ItemGroup>

Samples/360VideoPlayback/cs/360VideoPlayback.csproj

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<SharedContentDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), LICENSE))\SharedContent</SharedContentDir>
6+
</PropertyGroup>
47
<PropertyGroup>
58
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
69
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -74,7 +77,7 @@
7477
<Compile Include="Content\ShaderStructures.cs" />
7578
<Compile Include="Content\SpatialInputHandler.cs" />
7679
<Compile Include="Content\VideoRenderer.cs" />
77-
<Compile Include="..\..\..\SharedContent\cs\AssemblyInfo.cs">
80+
<Compile Include="$(SharedContentDir)\cs\AssemblyInfo.cs">
7881
<Link>Properties\AssemblyInfo.cs</Link>
7982
</Compile>
8083
<Compile Include="MainPage.xaml.cs">
@@ -94,31 +97,31 @@
9497
</AppxManifest>
9598
</ItemGroup>
9699
<ItemGroup>
97-
<Content Include="..\..\..\SharedContent\cs\Default.rd.xml">
100+
<Content Include="$(SharedContentDir)\cs\Default.rd.xml">
98101
<Link>Properties\Default.rd.xml</Link>
99102
</Content>
100-
<Content Include="..\..\..\SharedContent\media\windows-sdk.png">
103+
<Content Include="$(SharedContentDir)\media\windows-sdk.png">
101104
<Link>Assets\windows-sdk.png</Link>
102105
</Content>
103-
<Content Include="..\..\..\SharedContent\cs\Default.rd.xml">
106+
<Content Include="$(SharedContentDir)\cs\Default.rd.xml">
104107
<Link>Properties\Default.rd.xml</Link>
105108
</Content>
106-
<Content Include="..\..\..\SharedContent\media\microsoft-sdk.png">
109+
<Content Include="$(SharedContentDir)\media\microsoft-sdk.png">
107110
<Link>Assets\microsoft-sdk.png</Link>
108111
</Content>
109-
<Content Include="..\..\..\SharedContent\media\smalltile-sdk.png">
112+
<Content Include="$(SharedContentDir)\media\smalltile-sdk.png">
110113
<Link>Assets\smallTile-sdk.png</Link>
111114
</Content>
112-
<Content Include="..\..\..\SharedContent\media\splash-sdk.png">
115+
<Content Include="$(SharedContentDir)\media\splash-sdk.png">
113116
<Link>Assets\splash-sdk.png</Link>
114117
</Content>
115-
<Content Include="..\..\..\SharedContent\media\squaretile-sdk.png">
118+
<Content Include="$(SharedContentDir)\media\squaretile-sdk.png">
116119
<Link>Assets\squareTile-sdk.png</Link>
117120
</Content>
118-
<Content Include="..\..\..\SharedContent\media\storelogo-sdk.png">
121+
<Content Include="$(SharedContentDir)\media\storelogo-sdk.png">
119122
<Link>Assets\storeLogo-sdk.png</Link>
120123
</Content>
121-
<Content Include="..\..\..\SharedContent\media\tile-sdk.png">
124+
<Content Include="$(SharedContentDir)\media\tile-sdk.png">
122125
<Link>Assets\tile-sdk.png</Link>
123126
</Content>
124127
<Content Include="Assets\360Logo.png" />

Samples/3DPrinting/README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
---
2-
topic: sample
2+
page_type: sample
33
languages:
44
- csharp
55
products:
66
- windows
77
- windows-uwp
8+
urlFragment: 3DPrinting
9+
extendedZipContent:
10+
- path: SharedContent
11+
target: SharedContent
12+
- path: LICENSE
13+
target: LICENSE
14+
description: "Shows several tasks for 3D printing and editing the 3MF file type."
815
---
916

1017
<!---
@@ -44,7 +51,7 @@ Build the sample
4451
----------------
4552

4653
1. If you download the samples ZIP, be sure to unzip the entire archive, not just the folder with the sample you want to build.
47-
2. Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
54+
2. Start Microsoft Visual Studio and select **File** \> **Open** \> **Project/Solution**.
4855
3. Starting in the folder where you unzipped the samples, go to the Samples subfolder, then the subfolder for this specific sample, then the subfolder for your preferred language (C++, C#, or JavaScript). Double-click the Visual Studio Solution (.sln) file.
4956
4. Press Ctrl+Shift+B, or select **Build** \> **Build Solution**.
5057

Samples/3DPrinting/cs/3DPrinting.csproj

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<SharedContentDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), LICENSE))\SharedContent</SharedContentDir>
6+
</PropertyGroup>
47
<PropertyGroup>
58
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
69
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -87,15 +90,15 @@
8790
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
8891
</PropertyGroup>
8992
<ItemGroup>
90-
<Compile Include="..\..\..\SharedContent\cs\App.xaml.cs">
93+
<Compile Include="$(SharedContentDir)\cs\App.xaml.cs">
9194
<Link>App.xaml.cs</Link>
9295
<DependentUpon>App.xaml</DependentUpon>
9396
</Compile>
94-
<Compile Include="..\..\..\SharedContent\cs\MainPage.xaml.cs">
97+
<Compile Include="$(SharedContentDir)\cs\MainPage.xaml.cs">
9598
<Link>MainPage.xaml.cs</Link>
9699
<DependentUpon>MainPage.xaml</DependentUpon>
97100
</Compile>
98-
<Compile Include="..\..\..\SharedContent\cs\AssemblyInfo.cs">
101+
<Compile Include="$(SharedContentDir)\cs\AssemblyInfo.cs">
99102
<Link>Properties\AssemblyInfo.cs</Link>
100103
</Compile>
101104
<Compile Include="SampleConfiguration.cs" />
@@ -112,12 +115,12 @@
112115
</AppxManifest>
113116
</ItemGroup>
114117
<ItemGroup>
115-
<ApplicationDefinition Include="..\..\..\SharedContent\xaml\App.xaml">
118+
<ApplicationDefinition Include="$(SharedContentDir)\xaml\App.xaml">
116119
<Link>App.xaml</Link>
117120
<Generator>MSBuild:Compile</Generator>
118121
<SubType>Designer</SubType>
119122
</ApplicationDefinition>
120-
<Page Include="..\..\..\SharedContent\cs\MainPage.xaml">
123+
<Page Include="$(SharedContentDir)\cs\MainPage.xaml">
121124
<Link>MainPage.xaml</Link>
122125
<Generator>MSBuild:Compile</Generator>
123126
<SubType>Designer</SubType>
@@ -130,35 +133,35 @@
130133
<Generator>MSBuild:Compile</Generator>
131134
<SubType>Designer</SubType>
132135
</Page>
133-
<Page Include="..\..\..\SharedContent\xaml\Styles.xaml">
136+
<Page Include="$(SharedContentDir)\xaml\Styles.xaml">
134137
<Link>Styles\Styles.xaml</Link>
135138
<Generator>MSBuild:Compile</Generator>
136139
<SubType>Designer</SubType>
137140
</Page>
138141
</ItemGroup>
139142
<ItemGroup>
140-
<Content Include="..\..\..\SharedContent\cs\Default.rd.xml">
143+
<Content Include="$(SharedContentDir)\cs\Default.rd.xml">
141144
<Link>Properties\Default.rd.xml</Link>
142145
</Content>
143-
<Content Include="..\..\..\SharedContent\media\microsoft-sdk.png">
146+
<Content Include="$(SharedContentDir)\media\microsoft-sdk.png">
144147
<Link>Assets\microsoft-sdk.png</Link>
145148
</Content>
146-
<Content Include="..\..\..\SharedContent\media\smalltile-sdk.png">
149+
<Content Include="$(SharedContentDir)\media\smalltile-sdk.png">
147150
<Link>Assets\smallTile-sdk.png</Link>
148151
</Content>
149-
<Content Include="..\..\..\SharedContent\media\splash-sdk.png">
152+
<Content Include="$(SharedContentDir)\media\splash-sdk.png">
150153
<Link>Assets\splash-sdk.png</Link>
151154
</Content>
152-
<Content Include="..\..\..\SharedContent\media\squaretile-sdk.png">
155+
<Content Include="$(SharedContentDir)\media\squaretile-sdk.png">
153156
<Link>Assets\squareTile-sdk.png</Link>
154157
</Content>
155-
<Content Include="..\..\..\SharedContent\media\storelogo-sdk.png">
158+
<Content Include="$(SharedContentDir)\media\storelogo-sdk.png">
156159
<Link>Assets\storeLogo-sdk.png</Link>
157160
</Content>
158-
<Content Include="..\..\..\SharedContent\media\tile-sdk.png">
161+
<Content Include="$(SharedContentDir)\media\tile-sdk.png">
159162
<Link>Assets\tile-sdk.png</Link>
160163
</Content>
161-
<Content Include="..\..\..\SharedContent\media\windows-sdk.png">
164+
<Content Include="$(SharedContentDir)\media\windows-sdk.png">
162165
<Link>Assets\windows-sdk.png</Link>
163166
</Content>
164167
<Content Include="Assets\msLogo.png" />

Samples/3DPrintingFromUnity/README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
---
2-
topic: sample
2+
page_type: sample
33
languages:
44
- csharp
55
products:
66
- windows
77
- windows-uwp
8+
urlFragment: 3DPrintingFromUnity
9+
extendedZipContent:
10+
- path: SharedContent
11+
target: SharedContent
12+
- path: LICENSE
13+
target: LICENSE
14+
description: "Shows how to load a Unity 3D asset into the Windows 10 3D print dialog."
815
---
916

1017
<!---
@@ -34,15 +41,10 @@ Follow the instructions below to create and run the sample.
3441

3542
In addition to Visual Studio and the Windows SDK, you need the following:
3643

37-
* Unity version
44+
* [Visual Studio Tools for Unity](https://docs.microsoft.com/en-us/visualstudio/cross-platform/visual-studio-tools-for-unity?view=vs-2019)
45+
and Unity version
3846
[5.2.1p2](https://unity3d.com/unity/qa/patch-releases "Unity") or later.
3947

40-
* The Unity plugin for Visual Studio.
41-
This can be installed as part of installing Unity,
42-
or you can
43-
[download it](https://visualstudiogallery.msdn.microsoft.com/8d26236e-4a64-4d64-8486-7df95156aba9 "Visual Studio 2017 Tools for Unity")
44-
manually.
45-
4648
* The 3D Builder app.
4749
This application comes preinstalled with Windows 10.
4850
If you have uninstalled it,

Samples/Accelerometer/README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
topic: sample
2+
page_type: sample
33
languages:
44
- csharp
55
- cpp
@@ -8,6 +8,13 @@ languages:
88
products:
99
- windows
1010
- windows-uwp
11+
urlFragment: Accelerometer
12+
extendedZipContent:
13+
- path: SharedContent
14+
target: SharedContent
15+
- path: LICENSE
16+
target: LICENSE
17+
description: "Shows how to use the Accelerometer class."
1118
---
1219

1320
<!---
@@ -88,7 +95,7 @@ When you choose the **Enable** button for the **Data Events** option, the app be
8895
## Build the sample
8996

9097
1. If you download the samples ZIP, be sure to unzip the entire archive, not just the folder with the sample you want to build.
91-
2. Start Microsoft Visual Studio 2017 and select **File** \> **Open** \> **Project/Solution**.
98+
2. Start Microsoft Visual Studio and select **File** \> **Open** \> **Project/Solution**.
9299
3. Starting in the folder where you unzipped the samples, go to the Samples subfolder, then the subfolder for this specific sample, then the subfolder for your preferred language. Double-click the Visual Studio Solution (.sln) file.
93100
4. Press Ctrl+Shift+B, or select **Build** \> **Build Solution**.
94101

0 commit comments

Comments
 (0)