Skip to content

Commit 3fa37d5

Browse files
Colin Robertsonmikeblome
Colin Robertson
authored and
mikeblome
committed
Windows Store branding scrub (#590)
* Eradicate Windows Store where possible * Remove unused tokens * Fix link issue * trivial change
1 parent 2544e36 commit 3fa37d5

265 files changed

Lines changed: 435 additions & 439 deletions

File tree

Some content is hidden

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

‎docs/build/building-on-the-command-line.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Additional command files are available to set up specific build architectures, d
7272
>
7373
> The vcvarsall.bat file also varies from version to version. If the current version of Visual C++ is installed on a computer that also has an earlier version of Visual C++, do not run vcvarsall.bat or another command file from different versions in the same command prompt window.
7474
75-
The simplest way to specify a particular build architecture in an existing command window is to use the vcvarsall.bat file. You can use vcvarsall.bat to set environment variables to configure the command line for native 32-bit or 64-bit compilation, or for cross-compilation to x86, x64, or ARM processors; to target Windows Store, Universal Windows Platform, or Windows Desktop platforms; to specify which Windows SDK to use; and to specify the platform toolset version. If no arguments are provided, vcvarsall.bat configures the environment variables for using the current 32-bit native compiler for x86 Windows Desktop targets. However, you can use it to configure any of the native or cross compiler tools. If you specify a compiler configuration that is not installed or is not available on your build computer architecture, an error message is displayed. This table shows the supported architecture arguments:
75+
The simplest way to specify a particular build architecture in an existing command window is to use the vcvarsall.bat file. You can use vcvarsall.bat to set environment variables to configure the command line for native 32-bit or 64-bit compilation, or for cross-compilation to x86, x64, or ARM processors; to target Microsoft Store, Universal Windows Platform, or Windows Desktop platforms; to specify which Windows SDK to use; and to specify the platform toolset version. If no arguments are provided, vcvarsall.bat configures the environment variables for using the current 32-bit native compiler for x86 Windows Desktop targets. However, you can use it to configure any of the native or cross compiler tools. If you specify a compiler configuration that is not installed or is not available on your build computer architecture, an error message is displayed. This table shows the supported architecture arguments:
7676

7777
|Vcvarsall.bat architecture argument|Compiler|Host computer architecture|Build output architecture|
7878
|----------------------------|--------------|----------------------------------|-------------------------------|

‎docs/build/configuring-programs-for-windows-xp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Because Visual Studio supports multiple platform toolsets, you can target operat
3535

3636
These libraries are supported by the platform toolsets installed by Visual Studio, depending on the target:
3737

38-
|Library|Default platform toolset targeting Windows desktop apps|Default platform toolset targeting [!INCLUDE[win8_appname_long](../build/includes/win8_appname_long_md.md)] apps|Windows XP platform toolset targeting [!INCLUDE[winxp](../build/includes/winxp_md.md)], [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)]|
38+
|Library|Default platform toolset targeting Windows desktop apps|Default platform toolset targeting UWP apps|Windows XP platform toolset targeting [!INCLUDE[winxp](../build/includes/winxp_md.md)], [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)]|
3939
|-------------|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|
4040
|CRT|X|X|X|
4141
|C++ Standard Library|X|X|X|

‎docs/build/includes/win8_appname_long_md.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/build/reference/TOC.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
### [/ALIGN (Section Alignment)](align-section-alignment.md)
183183
### [/ALLOWBIND (Prevent DLL Binding)](allowbind-prevent-dll-binding.md)
184184
### [/ALLOWISOLATION (Manifest Lookup)](allowisolation-manifest-lookup.md)
185-
### [/APPCONTAINER (Windows Store App)](appcontainer-windows-store-app.md)
185+
### [/APPCONTAINER (UWP/Microsoft Store App)](appcontainer-windows-store-app.md)
186186
### [/ASSEMBLYDEBUG (Add DebuggableAttribute)](assemblydebug-add-debuggableattribute.md)
187187
### [/ASSEMBLYLINKRESOURCE (Link to .NET Framework Resource)](assemblylinkresource-link-to-dotnet-framework-resource.md)
188188
### [/ASSEMBLYMODULE (Add a MSIL Module to the Assembly)](assemblymodule-add-a-msil-module-to-the-assembly.md)

‎docs/build/reference/appcontainer-windows-store-app.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "-APPCONTAINER (Windows Store App) | Microsoft Docs"
2+
title: "/APPCONTAINER (UWP/Microsoft Store App) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
55
ms.reviewer: ""
@@ -15,7 +15,7 @@ ms.author: "corob"
1515
manager: "ghogen"
1616
ms.workload: ["cplusplus"]
1717
---
18-
# /APPCONTAINER (Windows Store App)
18+
# /APPCONTAINER (Microsoft Store App)
1919
Specifies whether the linker creates an executable image that must be run in an app container.
2020

2121
## Syntax
@@ -27,7 +27,7 @@ Specifies whether the linker creates an executable image that must be run in an
2727
## Remarks
2828
By default, /APPCONTAINER is off.
2929

30-
This option modifies an executable to indicate whether the app must be run in the appcontainer process-isolation environment. Specify /APPCONTAINER for an app that must run in the appcontainer environment—for example, a [!INCLUDE[win8_appstore_long](../../build/reference/includes/win8_appstore_long_md.md)] app. (The option is set automatically in Visual Studio when you create a [!INCLUDE[win8_appstore_long](../../build/reference/includes/win8_appstore_long_md.md)] app from a template.) For a desktop app, specify /APPCONTAINER:NO or just omit the option.
30+
This option modifies an executable to indicate whether the app must be run in the appcontainer process-isolation environment. Specify /APPCONTAINER for an app that must run in the appcontainer environment—for example, a Universal Windows Platform (UWP) or Windows Phone 8.x app. (The option is set automatically in Visual Studio when you create a Universal Windows app from a template.) For a desktop app, specify /APPCONTAINER:NO or just omit the option.
3131

3232
The /APPCONTAINER option was introduced in [!INCLUDE[win8](../../build/reference/includes/win8_md.md)].
3333

‎docs/build/reference/appcontainer.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ manager: "ghogen"
1818
ms.workload: ["cplusplus"]
1919
---
2020
# /APPCONTAINER
21-
Marks an executable that must run in an app container—for example, a [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] or Universal Windows app.
21+
Marks an executable that must run in an app container—for example, a Microsoft Store or Universal Windows app.
2222

2323
```
2424
2525
/APPCONTAINER[:NO]
2626
```
2727

2828
## Remarks
29-
An executable that has the **/APPCONTAINER** option set can only be run in an app container, which is the process-isolation environment introduced in Windows 8. For [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] and Universal Windows apps, this option must be set.
29+
An executable that has the **/APPCONTAINER** option set can only be run in an app container, which is the process-isolation environment introduced in Windows 8. For Microsoft Store and Universal Windows apps, this option must be set.
3030

3131
## See Also
3232
[EDITBIN Options](../../build/reference/editbin-options.md)

‎docs/build/reference/bigobj-increase-number-of-sections-in-dot-obj-file.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ms.workload: ["cplusplus"]
2929
## Remarks
3030
By default, an object file can hold up to 65,536 (2^16) addressable sections. This is the case no matter which target platform is specified. **/bigobj** increases that address capacity to 4,294,967,296 (2^32).
3131

32-
Most modules will never generate an .obj file that contains more than 65,536 sections. However, machine generated code, or code that makes heavy use of template libraries may require .obj files that can hold more sections. **/bigobj** is enabled by default on Windows Store projects because the machine-generated XAML code includes a large number of headers. If you disable this option on a Windows Store app project you are likely to encounter compiler error C1128.
32+
Most modules will never generate an .obj file that contains more than 65,536 sections. However, machine generated code, or code that makes heavy use of template libraries may require .obj files that can hold more sections. **/bigobj** is enabled by default on Universal Windows Platform (UWP) projects because the machine-generated XAML code includes a large number of headers. If you disable this option on a UWP app project you are likely to encounter compiler error C1128.
3333

3434
Linkers that shipped prior to Visual C++ 2005 cannot read .obj files that were produced with **/bigobj**.
3535

‎docs/build/reference/editbin-options.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can use EDITBIN to modify object files, executable files, and dynamic-link l
2828
|------------|-------------|
2929
|[/ALLOWBIND](../../build/reference/allowbind.md)|Specifies whether a DLL can be bound.|
3030
|[/ALLOWISOLATION](../../build/reference/allowisolation.md)|Specifies DLL or executable file manifest lookup behavior.|
31-
|[/APPCONTAINER](../../build/reference/appcontainer.md)|Specifies whether the app must run within an AppContainer—for example, a [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] app.|
31+
|[/APPCONTAINER](../../build/reference/appcontainer.md)|Specifies whether the app must run within an AppContainer—for example, a UWP app.|
3232
|[/BIND](../../build/reference/bind.md)|Sets the addresses for the entry points in the specified objects to speed load time.|
3333
|[/DYNAMICBASE](../../build/reference/dynamicbase.md)|Specifies whether the DLL or executable image can be randomly rebased at load-time by using address space layout randomization (ASLR).|
3434
|[/ERRORREPORT](../../build/reference/errorreport-editbin-exe.md)|Reports internal errors to Microsoft.|

‎docs/build/reference/includes/win8_appstore_long_md.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/build/reference/subsystem.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Specifies the execution environment that's required by the executable image.
3232
You can specify any of the following subsystems:
3333

3434
BOOT_APPLICATION
35-
An application that runs in the Windows boot environment. For more information about boot applications, see[About the BCD WMI Provider](http://msdn.microsoft.com/library/aa362639.aspx).
35+
An application that runs in the Windows boot environment. For more information about boot applications, see [About the BCD WMI Provider](http://msdn.microsoft.com/library/aa362639.aspx).
3636

3737
CONSOLE
3838
A Windows character-mode application. The operating system provides a console for console applications.
@@ -47,7 +47,7 @@ Specifies the execution environment that's required by the executable image.
4747
An app that runs in the POSIX subsystem in Windows.
4848

4949
WINDOWS
50-
An app that runs in the Windows graphical environment. This includes both desktop apps and Windows Store apps.
50+
An app that runs in the Windows graphical environment. This includes both desktop apps and Universal Windows Platform (UWP) apps.
5151

5252
WINDOWSCE
5353
The WINDOWSCE subsystem indicates that the app is intended to run on a device that has a version of the Windows CE kernel. Versions of the kernel include PocketPC, Windows Mobile, Windows Phone 7, Windows CE V1.0-6.0R3, and Windows Embedded Compact 7.

0 commit comments

Comments
 (0)