Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8ce5ad3
Update ADO builds to use VS 2019 and v142 toolset
jonthysell Feb 13, 2020
ec8b9a5
Update projects for VS 2019 and v142
jonthysell Feb 13, 2020
f3cd019
Update solutuions for VS 2019 and v142, move unit tests out of sample…
jonthysell Feb 13, 2020
3a17a78
Add comment to deforked file with upstream PR link
jonthysell Feb 13, 2020
48a6c26
Replace forked file with project change
jonthysell Feb 13, 2020
4112efc
Change files
jonthysell Feb 13, 2020
f7a7d35
Fixed failing E2Etests
jonthysell Feb 13, 2020
e9b5ab1
Re-added Microsoft.ReactNative mangaed unit tests
jonthysell Feb 13, 2020
42368d1
Disable broken arm64 managed unit tests
jonthysell Feb 13, 2020
c0d94c8
Enable universal unit tests on x86
jonthysell Feb 14, 2020
22ff29f
Addressing feedback: changing variable name
jonthysell Feb 14, 2020
8f28776
Addressing feedback: removing langauge standard in proj files
jonthysell Feb 14, 2020
037a5d6
Addressing feedback: removing ReactNativeWindows_PlatformToolset
jonthysell Feb 14, 2020
653da3a
Addressing feedback: Moving PlatformToolset to React.Cpp.props
jonthysell Feb 14, 2020
ca20d2f
Addressing feedback: variables syntax in task condition
jonthysell Feb 14, 2020
e33c65f
Addressing feedback: reverting e2etest masters
jonthysell Feb 14, 2020
318378c
Fix ControlStyleRoundBorder E2ETest
jonthysell Feb 14, 2020
dbe708a
Added better logging to DirectMAnipulation e2e tests
jonthysell Feb 14, 2020
b57e511
Merge branch 'master' into vs2019
jonthysell Feb 18, 2020
db83c65
Merge branch 'master' into vs2019
jonthysell Feb 19, 2020
83c816a
Merge branch 'master' into vs2019
jonthysell Feb 25, 2020
60325a2
Merge branch 'master' into vs2019
jonthysell Mar 5, 2020
6ffeaee
Merge branch 'master' into vs2019
jonthysell Mar 27, 2020
4d85d55
Switch back to x64 msbuild
jonthysell Mar 27, 2020
819c06d
Merge branch 'master' into vs2019
jonthysell Mar 30, 2020
e50f95c
Try switch to vsbuild
jonthysell Mar 30, 2020
32a6533
vsbuild update
jonthysell Mar 30, 2020
88b903d
Added vcvarsamd64_x86.bat
jonthysell Mar 30, 2020
bc2fa3b
Added vcvarsamd64_x86.bat fix
jonthysell Mar 30, 2020
f148bd1
Call vcvarsamd64_x86.bat with call
jonthysell Mar 30, 2020
09462c1
Remove vcvars
jonthysell Mar 30, 2020
b53e627
Added <AppxGeneratePrisForPortableLibrariesEnabled>false</AppxGenerat…
jonthysell Mar 30, 2020
cc77dc6
Merge branch 'master' into vs2019
jonthysell Mar 30, 2020
fc9768a
Build testcli with specified
jonthysell Mar 31, 2020
1b0fb70
Merge branch 'master' into vs2019
jonthysell Mar 31, 2020
6c95619
Update all project files to 16.0
jonthysell Mar 31, 2020
c06ccd8
Remove v141 from playground-win32
jonthysell Mar 31, 2020
9860fbd
Remove langstandard from playground-win32
jonthysell Mar 31, 2020
b4c5f0a
Fix E2ETEsts
jonthysell Mar 31, 2020
95c5e0e
Moved forced stdexcept include
jonthysell Apr 1, 2020
d7d988b
Merge branch 'master' into vs2019
jonthysell Apr 1, 2020
31e0f90
Revert unnecessary E2ETest changes
jonthysell Apr 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 0.0.$(Date:yyMM.d)$(Rev:rrr)

variables:
- template: variables/msbuild.yml
- template: variables/vs2017.yml
- template: variables/vs2019.yml

trigger:
batch: true
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
- template: templates/build-rnw.yml
parameters:
project: vnext/ReactWindows-Universal.sln
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
vsComponents: $(VsComponents)

- template: templates/publish-build-artifacts-for-nuget.yml
parameters:
Expand Down
10 changes: 1 addition & 9 deletions .ado/templates/e2e-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,8 @@ jobs:
dependsOn: Setup
condition: ne( dependencies.Setup.outputs['checkPayload.shouldSkipPRBuild'], 'True' )

# E2ETest is in the pipeline of windows-vs-pr, but windows-vs-pr is still using vs2017.yml
# E2ETest can only be executed on windows-2019 or above, so force to use windows-2019 image and override vs2017.yml variables
# so pool and variables are hard coded here.
pool:
vmImage: windows-2019
variables:
VsComponents: Microsoft.Component.MSBuild,Microsoft.VisualStudio.ComponentGroup.UWP.VC,Microsoft.VisualStudio.Component.VC.Tools.x86.x64,Microsoft.VisualStudio.Component.VC.Tools.ARM,Microsoft.VisualStudio.Component.VC.Tools.ARM64,Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141,Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir
runCodesignValidationInjection: false
VmImage: windows-2019
vmImage: $(VmImage)

timeoutInMinutes: 60 # how long to run the job before automatically cancelling
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/prepare-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ steps:
-InstallerUri ${{ parameters.vsInstallerUri }}
-Components ${{ parameters.vsComponents }}
-Collect:$${{ parameters.debug }}
condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019'))
condition: and(ne('${{ parameters.vsComponents }}', ''), eq(variables['VmImage'], 'windows-2019')) # Note that this is evaluated at parsing, so parameters.vsComponents is never empty

- task: PowerShell@2
displayName: List disksize after prepare-env
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/react-native-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ steps:
arguments:
-InstallerUri ${{ parameters.vsInstallerUri }}
-Components ${{ parameters.vsComponents }}
condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019'))
condition: and(ne('${{ parameters.vsComponents }}', ''), eq(variables['VmImage'], 'windows-2019')) # Note that this is evaluated at parsing, so parameters.vsComponents is never empty

- task: VSBuild@1
displayName: VSBuild - testcli
Expand Down
2 changes: 1 addition & 1 deletion .ado/variables/msbuild.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
MSBuildArchitecture: x64
MSBuildPreferredToolArchitecture: x64
MSBuildPlatformToolset: v141
MSBuildPlatformToolset: v142
TargetPlatformVersion: 10.0.18362.0
Win10Version: 18362
VsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe'
6 changes: 0 additions & 6 deletions .ado/variables/vs2017.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .ado/variables/vs2019.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
VmImage: windows-2019
VsComponents: Microsoft.Component.MSBuild,Microsoft.VisualStudio.ComponentGroup.UWP.VC,Microsoft.VisualStudio.Component.VC.Tools.x86.x64,Microsoft.VisualStudio.Component.VC.Tools.ARM,Microsoft.VisualStudio.Component.VC.Tools.ARM64,Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141,Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
VsComponents: 'Microsoft.Component.MSBuild,Microsoft.VisualStudio.ComponentGroup.UWP.VC,Microsoft.VisualStudio.Component.VC.Tools.x86.x64,Microsoft.VisualStudio.Component.VC.Tools.ARM,Microsoft.VisualStudio.Component.VC.Tools.ARM64'
MSBuildVersion: 16.0
GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\pemwd5jw.szc'
BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir # redirect to C:
runCodesignValidationInjection: false
runCodesignValidationInjection: false
24 changes: 8 additions & 16 deletions .ado/windows-vs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pr:

variables:
- template: variables/msbuild.yml
- template: variables/vs2017.yml # when using vs2019.yml, please remove workaround in e2e-test-job which is forced to use windows-2019 image.
- template: variables/vs2019.yml

jobs:
- job: Setup
Expand Down Expand Up @@ -63,14 +63,14 @@ jobs:

- task: VisualStudioTestPlatformInstaller@1
inputs:
testPlatformVersion: 15.9.2
condition: and(ne(variables.BuildPlatform, 'ARM'), ne(variables.BuildPlatform, 'ARM64'))
testPlatformVersion: latestStable
condition: and(ne(variables.BuildPlatform, 'arm'), ne(variables.BuildPlatform, 'arm64'))

- template: templates/build-rnw.yml
parameters:
yarnBuildCmd: build
project: vnext/ReactWindows-Universal.sln
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
vsComponents: $(VsComponents)

- task: VSTest@2
displayName: Run Universal Unit Tests
Expand All @@ -89,8 +89,8 @@ jobs:
configuration: $(BuildConfiguration)
publishRunAttachments: true
collectDumpOn: onAbortOnly
vsTestVersion: 15.0
condition: and(ne(variables.BuildPlatform, 'ARM'), ne(variables.BuildPlatform, 'ARM64'))
vsTestVersion: latest
condition: and(ne(variables.BuildPlatform, 'arm'), ne(variables.BuildPlatform, 'arm64'))

- template: templates/publish-build-artifacts-for-nuget.yml
parameters:
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:

- template: templates/prepare-env.yml
parameters:
vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
vsComponents: $(VsComponents)
yarnBuildCmd: build

- task: NuGetCommand@2
Expand Down Expand Up @@ -210,16 +210,8 @@ jobs:
BuildPlatform: ARM
timeoutInMinutes: 60
cancelTimeoutInMinutes: 5
#pool:
# vmImage: $(VmImage)
# Temporary override until we move to VS 2019 v142
pool:
vmImage: windows-2019
variables:
VsComponents: Microsoft.Component.MSBuild,Microsoft.VisualStudio.ComponentGroup.UWP.VC,Microsoft.VisualStudio.Component.VC.Tools.x86.x64,Microsoft.VisualStudio.Component.VC.Tools.ARM,Microsoft.VisualStudio.Component.VC.Tools.ARM64,Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141,Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64
BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir
runCodesignValidationInjection: false
VmImage: windows-2019
vmImage: $(VmImage)

steps:
- checkout: self
Expand Down
9 changes: 9 additions & 0 deletions change/react-native-windows-2020-02-13-14-37-32-vs2019.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "prerelease",
"comment": "Switching to VS 2019 and v142 tools",
"packageName": "react-native-windows",
"email": "jthysell@microsoft.com",
"commit": "48a6c268b66140a908ef37e66f586a527e93aac0",
"dependentChangeType": "patch",
"date": "2020-02-13T22:37:32.478Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "prerelease",
"comment": "Switching to VS 2019 and v142 tools",
"packageName": "react-native-windows-extended",
"email": "jthysell@microsoft.com",
"commit": "48a6c268b66140a908ef37e66f586a527e93aac0",
"dependentChangeType": "patch",
"date": "2020-02-13T22:37:26.611Z"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.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>
Expand All @@ -13,7 +13,7 @@
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
Expand Down Expand Up @@ -148,8 +148,8 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
<VisualStudioVersion>16.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.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>
Expand All @@ -13,7 +13,7 @@
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
Expand Down Expand Up @@ -106,8 +106,8 @@
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
<VisualStudioVersion>16.0</VisualStudioVersion>
</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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
Expand All @@ -9,7 +9,7 @@
<ProjectName>SampleAppCpp</ProjectName>
<RootNamespace>SampleAppCpp</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
Expand Down Expand Up @@ -70,7 +70,6 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.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>
Expand All @@ -13,7 +13,7 @@
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
Expand Down Expand Up @@ -171,8 +171,8 @@
</PackageReference>
</ItemGroup>
<Import Project="$(ReactNativeWindowsDir)\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
<VisualStudioVersion>15.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
<VisualStudioVersion>16.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup>
<BundleCommand>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
Expand All @@ -9,7 +9,7 @@
<ProjectName>SampleLibraryCpp</ProjectName>
<RootNamespace>SampleLibraryCpp</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
Expand Down Expand Up @@ -45,9 +45,6 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Generated Files">
<UniqueIdentifier>{926ab91d-31b4-48c3-b9a4-e681349f27f0}</UniqueIdentifier>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.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>
Expand All @@ -13,7 +13,7 @@
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
Expand Down Expand Up @@ -110,8 +110,8 @@
</Page>
</ItemGroup>
<Import Project="..\..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
<VisualStudioVersion>16.0</VisualStudioVersion>
</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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}</ProjectGuid>
<RootNamespace>Playground</RootNamespace>
Expand Down Expand Up @@ -37,7 +37,6 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
Expand Down Expand Up @@ -70,7 +69,6 @@
<ClCompile>
<CallingConvention>StdCall</CallingConvention>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<SDLCheck>true</SDLCheck>
Expand Down
Loading