From fdd1867513d90948c1bc712e5825d8c876dbc802 Mon Sep 17 00:00:00 2001 From: "Andrew Coates (REDMOND)" Date: Wed, 8 Apr 2020 20:56:27 -0700 Subject: [PATCH 01/23] Publish fix --- .ado/setVersionEnvVars.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ado/setVersionEnvVars.js b/.ado/setVersionEnvVars.js index 62ef9340802..743aafc0e64 100644 --- a/.ado/setVersionEnvVars.js +++ b/.ado/setVersionEnvVars.js @@ -56,6 +56,9 @@ console.log("##[set-env name=RNW_PKG_VERSION_MINOR;]${versionEnvVars.RNW_PKG_VER console.log("::[set-env name=RNW_PKG_VERSION_PATCH;]${versionEnvVars.RNW_PKG_VERSION_PATCH}"); console.log("##[set-env name=RNW_PKG_VERSION_PATCH;]${versionEnvVars.RNW_PKG_VERSION_PATCH}"); console.log("##vso[task.setvariable variable=RNW_PKG_VERSION_STR]${versionEnvVars.RNW_PKG_VERSION_STR}"); +console.log("##vso[task.setvariable variable=RNW_PKG_VERSION_MAJOR]${versionEnvVars.RNW_PKG_VERSION_MAJOR}"); +console.log("##vso[task.setvariable variable=RNW_PKG_VERSION_MINOR]${versionEnvVars.RNW_PKG_VERSION_MINOR}"); +console.log("##vso[task.setvariable variable=RNW_PKG_VERSION_PATCH]${versionEnvVars.RNW_PKG_VERSION_PATCH}"); console.log("::[set-env name=npmVersion;]${versionEnvVars.npmVersion}"); console.log("##[set-env name=npmVersion;]${versionEnvVars.npmVersion}"); console.log("##vso[task.setvariable variable=npmVersion]${versionEnvVars.npmVersion}"); From a53564d6a2a516b93f4455e44badd3cb85f1fc74 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Thu, 9 Apr 2020 10:12:22 -0700 Subject: [PATCH 02/23] Creating new Microsoft.ReactNative.sln (#4535) * Created new Microsoft.ReactNative.sln * Update PR to build vnext/Microsoft.ReactNative.sln * Add params to disable ReactUWP nuget pack during PR --- .ado/templates/prep-and-pack-nuget.yml | 8 + .ado/windows-vs-pr.yml | 6 +- ...s-2020-04-08-17-12-17-reactuwpsoftdel.json | 8 + vnext/Microsoft.ReactNative.sln | 309 ++++++++++++++++++ 4 files changed, 328 insertions(+), 3 deletions(-) create mode 100644 change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json create mode 100644 vnext/Microsoft.ReactNative.sln diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 5b80f2ded72..45bcf784f2f 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -7,6 +7,9 @@ parameters: microsoftRNId: 'Microsoft.ReactNative' universalId: 'OfficeReact.UWP' slices: '("x64.Release", "x64.Debug", "x86.Release", "x86.Debug", "ARM.Release", "ARM.Debug", "ARM64.Release", "ARM64.Debug")' + packDesktop: true + packMicrosoft: true + packUniversal: true steps: - task: DownloadBuildArtifacts@0 @@ -22,6 +25,7 @@ steps: targetType: filePath filePath: $(System.DefaultWorkingDirectory)\ReactWindows\StripAdditionalPlatformsFromNuspec.ps1 arguments: -nuspec $(System.DefaultWorkingDirectory)/ReactWindows/ReactUWP.nuspec -outfile $(System.DefaultWorkingDirectory)/ReactWindows/ReactUWP.nuspec -slices ("x64.Release", "x86.Debug", "ARM.Release") + condition: and(succeeded(), ${{ parameters.packUniversal }}) - task: PowerShell@2 displayName: Strip slices from Microsoft.ReactNative.nuspec @@ -29,6 +33,7 @@ steps: targetType: filePath filePath: $(System.DefaultWorkingDirectory)\ReactWindows\StripAdditionalPlatformsFromNuspec.ps1 arguments: -nuspec $(System.DefaultWorkingDirectory)/ReactWindows/Microsoft.ReactNative.nuspec -outfile $(System.DefaultWorkingDirectory)/ReactWindows/Microsoft.ReactNative.nuspec -slices ("x64.Release", "x86.Debug", "ARM.Release") + condition: and(succeeded(), ${{ parameters.packMicrosoft }}) - task: NuGetCommand@2 displayName: 'NuGet pack Desktop' @@ -37,6 +42,7 @@ steps: packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/ReactWin32.nuspec packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal buildProperties: CommitId=${{parameters.publishCommitId}};version=${{parameters.npmVersion}};id=${{parameters.desktopId}};nugetroot=${{parameters.nugetroot}} + condition: and(succeeded(), ${{ parameters.packDesktop }}) - task: NuGetCommand@2 displayName: 'NuGet pack Universal' @@ -45,6 +51,7 @@ steps: packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/ReactUWP.nuspec packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal buildProperties: CommitId=${{parameters.publishCommitId}};version=${{parameters.npmVersion}};id=${{parameters.universalId}};nugetroot=${{parameters.nugetroot}} + condition: and(succeeded(), ${{ parameters.packUniversal }}) - task: NuGetCommand@2 displayName: 'NuGet pack Microsoft.ReactNative' @@ -53,3 +60,4 @@ steps: packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/Microsoft.ReactNative.nuspec packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal buildProperties: CommitId=${{parameters.publishCommitId}};version=${{parameters.npmVersion}};id=${{parameters.microsoftRNId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=x64 + condition: and(succeeded(), ${{ parameters.packMicrosoft }}) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 78ed9e268df..7c8636ad4a8 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -73,7 +73,7 @@ jobs: - template: templates/build-rnw.yml parameters: yarnBuildCmd: build - project: vnext/ReactWindows-Universal.sln + project: vnext/Microsoft.ReactNative.sln - task: VSTest@2 displayName: Run Universal Unit Tests @@ -100,7 +100,6 @@ jobs: artifactName: ReactWindows layoutHeaders: eq('true', variables['LayoutHeaders']) contents: | - ReactUWP\** Microsoft.ReactNative\** - script: | @@ -603,4 +602,5 @@ jobs: - template: templates/prep-and-pack-nuget.yml parameters: - slices: '("x64.Release", "x86.Debug", "ARM.Debug")' \ No newline at end of file + slices: '("x64.Release", "x86.Debug", "ARM.Debug")' + packUniversal: false \ No newline at end of file diff --git a/change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json b/change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json new file mode 100644 index 00000000000..55c9a01e8fe --- /dev/null +++ b/change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Creating new Microsoft.ReactNative.sln without legacy ReactUWP", + "packageName": "react-native-windows", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-04-09T00:12:17.073Z" +} \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln new file mode 100644 index 00000000000..3687dcfa17b --- /dev/null +++ b/vnext/Microsoft.ReactNative.sln @@ -0,0 +1,309 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30002.166 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Shared", "JSI\Shared\JSI.Shared.vcxitems", "{0CC28589-39E4-4288-B162-97B959F8B843}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Universal", "JSI\Universal\JSI.Universal.vcxproj", "{A62D504A-16B8-41D2-9F19-E2E86019E5E4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx.UnitTests", "Microsoft.ReactNative.Cxx.UnitTests\Microsoft.ReactNative.Cxx.UnitTests.vcxproj", "{6C60E295-C8CA-4DC5-B8BE-09888F58B249}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed.UnitTests", "Microsoft.ReactNative.Managed.UnitTests\Microsoft.ReactNative.Managed.UnitTests.csproj", "{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.ReactNative.SharedManaged", "Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.shproj", "{67A1076F-7790-4203-86EA-4402CCB5E782}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{25C4DA8C-A4D2-4D5F-950A-E5371A8AB659}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies (External)", "Dependencies (External)", "{814A1893-F3C3-45BA-8C80-5377CFD86C5F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies (Internal)", "Dependencies (Internal)", "{6348365C-E58A-4CB4-96CA-E2A6C1201DD6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{1DA4BB3B-D0B1-4933-BDBA-60B553B4F946}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{D1CDE6A6-E011-4852-8500-E259AD60846F}" + ProjectSection(SolutionItems) = preProject + PropertySheets\ARM.props = PropertySheets\ARM.props + PropertySheets\ARM64.props = PropertySheets\ARM64.props + PropertySheets\Bundle.Common.targets = PropertySheets\Bundle.Common.targets + PropertySheets\Bundle.Cpp.targets = PropertySheets\Bundle.Cpp.targets + PropertySheets\Bundle.props = PropertySheets\Bundle.props + PropertySheets\Bundle.targets = PropertySheets\Bundle.targets + PropertySheets\Debug.props = PropertySheets\Debug.props + PropertySheets\React.Cpp.props = PropertySheets\React.Cpp.props + PropertySheets\ReactCommunity.cpp.props = PropertySheets\ReactCommunity.cpp.props + PropertySheets\ReactDirectories.props = PropertySheets\ReactDirectories.props + PropertySheets\ReactPatches.targets = PropertySheets\ReactPatches.targets + PropertySheets\Release.props = PropertySheets\Release.props + PropertySheets\Warnings.props = PropertySheets\Warnings.props + PropertySheets\Win32.props = PropertySheets\Win32.props + PropertySheets\x64.props = PropertySheets\x64.props + PropertySheets\x86.props = PropertySheets\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{4CA4053F-17D8-4619-8600-FF672209828C}" + ProjectSection(SolutionItems) = preProject + PropertySheets\Application\ARM.props = PropertySheets\Application\ARM.props + PropertySheets\Application\ARM64.props = PropertySheets\Application\ARM64.props + PropertySheets\Application\Debug.props = PropertySheets\Application\Debug.props + PropertySheets\Application\DebugBundle.props = PropertySheets\Application\DebugBundle.props + PropertySheets\Application\Release.props = PropertySheets\Application\Release.props + PropertySheets\Application\ReleaseBundle.props = PropertySheets\Application\ReleaseBundle.props + PropertySheets\Application\Win32.props = PropertySheets\Application\Win32.props + PropertySheets\Application\x64.props = PropertySheets\Application\x64.props + PropertySheets\Application\x86.props = PropertySheets\Application\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLibrary", "{19F9503C-4A05-4F96-8A41-0BD93228F220}" + ProjectSection(SolutionItems) = preProject + PropertySheets\DynamicLibrary\ARM.props = PropertySheets\DynamicLibrary\ARM.props + PropertySheets\DynamicLibrary\ARM64.props = PropertySheets\DynamicLibrary\ARM64.props + PropertySheets\DynamicLibrary\Debug.props = PropertySheets\DynamicLibrary\Debug.props + PropertySheets\DynamicLibrary\DebugBundle.props = PropertySheets\DynamicLibrary\DebugBundle.props + PropertySheets\DynamicLibrary\Release.props = PropertySheets\DynamicLibrary\Release.props + PropertySheets\DynamicLibrary\ReleaseBundle.props = PropertySheets\DynamicLibrary\ReleaseBundle.props + PropertySheets\DynamicLibrary\Win32.props = PropertySheets\DynamicLibrary\Win32.props + PropertySheets\DynamicLibrary\x64.props = PropertySheets\DynamicLibrary\x64.props + PropertySheets\DynamicLibrary\x86.props = PropertySheets\DynamicLibrary\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibrary", "{529E25F3-F1D4-41CC-9BAC-DEE9A5B0FF97}" + ProjectSection(SolutionItems) = preProject + PropertySheets\StaticLibrary\ARM.props = PropertySheets\StaticLibrary\ARM.props + PropertySheets\StaticLibrary\ARM64.props = PropertySheets\StaticLibrary\ARM64.props + PropertySheets\StaticLibrary\Debug.props = PropertySheets\StaticLibrary\Debug.props + PropertySheets\StaticLibrary\DebugBundle.props = PropertySheets\StaticLibrary\DebugBundle.props + PropertySheets\StaticLibrary\Release.props = PropertySheets\StaticLibrary\Release.props + PropertySheets\StaticLibrary\ReleaseBundle.props = PropertySheets\StaticLibrary\ReleaseBundle.props + PropertySheets\StaticLibrary\Win32.props = PropertySheets\StaticLibrary\Win32.props + PropertySheets\StaticLibrary\x64.props = PropertySheets\StaticLibrary\x64.props + PropertySheets\StaticLibrary\x86.props = PropertySheets\StaticLibrary\x86.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MIDL", "MIDL", "{A7A199BB-2B8D-4142-92D0-5EA0B299F287}" + ProjectSection(SolutionItems) = preProject + PropertySheets\MIDL\midlrt.props = PropertySheets\MIDL\midlrt.props + PropertySheets\MIDL\midlrt.targets = PropertySheets\MIDL\midlrt.targets + PropertySheets\MIDL\MidlRT.xml = PropertySheets\MIDL\MidlRT.xml + EndProjectSection +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 + Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 + Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{46d76f7a-8fd9-4a7d-8102-2857e5da6b84}*SharedItemsImports = 4 + Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 + JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 + Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.Build.0 = Debug|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.Build.0 = Release|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM.ActiveCfg = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM64.ActiveCfg = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.ActiveCfg = Debug|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.Build.0 = Debug|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.ActiveCfg = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.Build.0 = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM.ActiveCfg = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM64.ActiveCfg = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.ActiveCfg = Release|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.Build.0 = Release|x64 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.ActiveCfg = Release|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.Build.0 = Release|Win32 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.ActiveCfg = Debug|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.ActiveCfg = Debug|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Deploy.0 = Debug|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.ActiveCfg = Debug|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Build.0 = Debug|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Deploy.0 = Debug|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.ActiveCfg = Release|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.ActiveCfg = Release|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.ActiveCfg = Release|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Deploy.0 = Release|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.ActiveCfg = Release|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Build.0 = Release|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Deploy.0 = Release|x86 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.Build.0 = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM64.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {814A1893-F3C3-45BA-8C80-5377CFD86C5F} + {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {0CC28589-39E4-4288-B162-97B959F8B843} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {A62D504A-16B8-41D2-9F19-E2E86019E5E4} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {6C60E295-C8CA-4DC5-B8BE-09888F58B249} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE} = {25C4DA8C-A4D2-4D5F-950A-E5371A8AB659} + {11C084A3-A57C-4296-A679-CAC17B603144} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {6348365C-E58A-4CB4-96CA-E2A6C1201DD6} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {814A1893-F3C3-45BA-8C80-5377CFD86C5F} + {D1CDE6A6-E011-4852-8500-E259AD60846F} = {1DA4BB3B-D0B1-4933-BDBA-60B553B4F946} + {4CA4053F-17D8-4619-8600-FF672209828C} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {19F9503C-4A05-4F96-8A41-0BD93228F220} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {529E25F3-F1D4-41CC-9BAC-DEE9A5B0FF97} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + {A7A199BB-2B8D-4142-92D0-5EA0B299F287} = {D1CDE6A6-E011-4852-8500-E259AD60846F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {988F03E6-640A-4C7E-8B55-C1291B70669E} + EndGlobalSection +EndGlobal From 8bc5d3aefee6d000ed9ba8ec1443306a724e6e78 Mon Sep 17 00:00:00 2001 From: React-Native-Windows Bot <53619745+rnbot@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:16:45 +0000 Subject: [PATCH 03/23] applying package updates ***NO_CI*** --- ...ndows-2020-04-08-17-12-17-reactuwpsoftdel.json | 8 -------- packages/E2ETest/package.json | 2 +- .../microsoft-reactnative-sampleapps/package.json | 2 +- packages/playground/package.json | 2 +- vnext/CHANGELOG.json | 15 +++++++++++++++ vnext/CHANGELOG.md | 10 +++++++++- vnext/package.json | 2 +- 7 files changed, 28 insertions(+), 13 deletions(-) delete mode 100644 change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json diff --git a/change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json b/change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json deleted file mode 100644 index 55c9a01e8fe..00000000000 --- a/change/react-native-windows-2020-04-08-17-12-17-reactuwpsoftdel.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "prerelease", - "comment": "Creating new Microsoft.ReactNative.sln without legacy ReactUWP", - "packageName": "react-native-windows", - "email": "jthysell@microsoft.com", - "dependentChangeType": "patch", - "date": "2020-04-09T00:12:17.073Z" -} \ No newline at end of file diff --git a/packages/E2ETest/package.json b/packages/E2ETest/package.json index 203fb1f00a7..f4fa6b2fe27 100644 --- a/packages/E2ETest/package.json +++ b/packages/E2ETest/package.json @@ -24,7 +24,7 @@ "dependencies": { "react": "16.9.0", "react-native": "0.61.5", - "react-native-windows": "0.0.0-master.25", + "react-native-windows": "0.0.0-master.26", "rnpm-plugin-windows": "^0.6.1" }, "devDependencies": { diff --git a/packages/microsoft-reactnative-sampleapps/package.json b/packages/microsoft-reactnative-sampleapps/package.json index efa9414c0c6..e70517faaf7 100644 --- a/packages/microsoft-reactnative-sampleapps/package.json +++ b/packages/microsoft-reactnative-sampleapps/package.json @@ -16,7 +16,7 @@ "dependencies": { "react": "16.9.0", "react-native": "0.61.5", - "react-native-windows": "0.0.0-master.25", + "react-native-windows": "0.0.0-master.26", "rnpm-plugin-windows": "^0.6.1" }, "devDependencies": { diff --git a/packages/playground/package.json b/packages/playground/package.json index 39123440a00..a8a29efb693 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -14,7 +14,7 @@ "dependencies": { "react": "16.9.0", "react-native": "0.61.5", - "react-native-windows": "0.0.0-master.25", + "react-native-windows": "0.0.0-master.26", "rnpm-plugin-windows": "^0.6.1" }, "devDependencies": { diff --git a/vnext/CHANGELOG.json b/vnext/CHANGELOG.json index 30e7e10e2f7..a8217c28918 100644 --- a/vnext/CHANGELOG.json +++ b/vnext/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "react-native-windows", "entries": [ + { + "date": "Thu, 09 Apr 2020 17:16:44 GMT", + "tag": "react-native-windows_v0.0.0-master.26", + "version": "0.0.0-master.26", + "comments": { + "prerelease": [ + { + "comment": "Creating new Microsoft.ReactNative.sln without legacy ReactUWP", + "author": "jthysell@microsoft.com", + "commit": "407c0834ada43cd9d42c24cb6ddfe7c91ddf960a", + "package": "react-native-windows" + } + ] + } + }, { "date": "Wed, 08 Apr 2020 19:59:18 GMT", "tag": "react-native-windows_v0.0.0-master.25", diff --git a/vnext/CHANGELOG.md b/vnext/CHANGELOG.md index 513d8af393d..3374289133a 100644 --- a/vnext/CHANGELOG.md +++ b/vnext/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - react-native-windows -This log was last generated on Wed, 08 Apr 2020 19:59:18 GMT and should not be manually modified. +This log was last generated on Thu, 09 Apr 2020 17:16:44 GMT and should not be manually modified. +## 0.0.0-master.26 + +Thu, 09 Apr 2020 17:16:44 GMT + +### Changes + +- Creating new Microsoft.ReactNative.sln without legacy ReactUWP (jthysell@microsoft.com) + ## 0.0.0-master.25 Wed, 08 Apr 2020 19:59:18 GMT diff --git a/vnext/package.json b/vnext/package.json index 9264f67b749..e2a58b6a116 100644 --- a/vnext/package.json +++ b/vnext/package.json @@ -1,6 +1,6 @@ { "name": "react-native-windows", - "version": "0.0.0-master.25", + "version": "0.0.0-master.26", "license": "MIT", "repository": { "type": "git", From ddbfb0469a074511d93b3e10b3dfdfe39a2e9e73 Mon Sep 17 00:00:00 2001 From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com> Date: Thu, 9 Apr 2020 12:45:00 -0700 Subject: [PATCH 04/23] Move playground app to use Microsoft.ReactNative (#4534) * Move playground app to use Microsoft.ReactNative * formatting * Bunch of code review feedback * Change files * formatting * Delete unneeded gitignore * Minor removal of diff * Minor changes to try to avoid having to update cert all the time * Fix bundle command * No need to build rntester seperately, the release build of playground will do it from msbuild * Remove test property --- .ado/windows-vs-pr.yml | 13 +- ...32-2020-04-09-09-01-15-msrnplayground.json | 8 + ...ws-2020-04-09-09-01-15-msrnplayground.json | 8 + packages/E2ETest/package.json | 8 +- .../package.json | 8 +- packages/playground/.eslintignore | 1 - packages/playground/.eslintrc.js | 6 +- packages/playground/.gitignore | 3 - packages/playground/.npmrc | 1 - packages/playground/README.md | 53 +- packages/playground/Samples/messages.tsx | 23 +- packages/playground/app.json | 4 - packages/playground/babel.config.js | 3 + packages/playground/just-task.js | 28 +- packages/playground/metro.config.js | 30 +- packages/playground/package.json | 19 +- packages/playground/packages.config | 3 +- packages/playground/postinstall.js | 42 -- packages/playground/react-native.config.js | 6 +- packages/playground/windows/.gitignore | 92 ++++ packages/playground/windows/playground.sln | 159 ++++-- .../playground/windows/playground/App.cpp | 104 ++++ packages/playground/windows/playground/App.h | 12 + .../playground/windows/playground/App.idl | 3 + .../playground/windows/playground/App.xaml | 9 +- .../windows/playground/App.xaml.cpp | 113 ---- .../playground/windows/playground/App.xaml.h | 27 - .../windows/playground/Bundle/.gitignore | 2 + .../windows/playground/HostingPane.xaml | 165 ------ .../windows/playground/HostingPane.xaml.cpp | 498 ------------------ .../windows/playground/HostingPane.xaml.h | 87 --- .../windows/playground/MainPage.cpp | 97 ++++ .../playground/windows/playground/MainPage.h | 34 ++ .../windows/playground/MainPage.idl | 11 + .../windows/playground/MainPage.xaml | 144 ++++- .../windows/playground/MainPage.xaml.cpp | 130 ----- .../windows/playground/MainPage.xaml.h | 36 -- .../windows/playground/Package.appxmanifest | 41 +- .../windows/playground/Playground.vcxproj | 165 +++--- .../playground/Playground.vcxproj.filters | 63 +-- .../windows/playground/PropertySheet.props | 16 + .../playground/ReactPackageProvider.cpp | 16 + .../windows/playground/ReactPackageProvider.h | 17 + .../playground/Utilities/RelayCommand.cpp | 32 -- .../playground/Utilities/RelayCommand.h | 26 - .../playground/ViewLifetimeControl.cpp | 259 --------- .../windows/playground/ViewLifetimeControl.h | 91 ---- .../windows/playground/nativeModules.g.h | 2 + .../windows/playground/packages.config | 1 + .../playground/windows/playground/pch.cpp | 1 - packages/playground/windows/playground/pch.h | 31 +- packages/react-native-win32/package.json | 2 +- vnext/package.json | 2 +- yarn.lock | 341 ++---------- 54 files changed, 975 insertions(+), 2121 deletions(-) create mode 100644 change/@office-iss-react-native-win32-2020-04-09-09-01-15-msrnplayground.json create mode 100644 change/react-native-windows-2020-04-09-09-01-15-msrnplayground.json delete mode 100644 packages/playground/.eslintignore delete mode 100644 packages/playground/.gitignore delete mode 100644 packages/playground/.npmrc delete mode 100644 packages/playground/app.json create mode 100644 packages/playground/babel.config.js delete mode 100644 packages/playground/postinstall.js create mode 100644 packages/playground/windows/.gitignore create mode 100644 packages/playground/windows/playground/App.cpp create mode 100644 packages/playground/windows/playground/App.h create mode 100644 packages/playground/windows/playground/App.idl delete mode 100644 packages/playground/windows/playground/App.xaml.cpp delete mode 100644 packages/playground/windows/playground/App.xaml.h create mode 100644 packages/playground/windows/playground/Bundle/.gitignore delete mode 100644 packages/playground/windows/playground/HostingPane.xaml delete mode 100644 packages/playground/windows/playground/HostingPane.xaml.cpp delete mode 100644 packages/playground/windows/playground/HostingPane.xaml.h create mode 100644 packages/playground/windows/playground/MainPage.cpp create mode 100644 packages/playground/windows/playground/MainPage.h create mode 100644 packages/playground/windows/playground/MainPage.idl delete mode 100644 packages/playground/windows/playground/MainPage.xaml.cpp delete mode 100644 packages/playground/windows/playground/MainPage.xaml.h create mode 100644 packages/playground/windows/playground/PropertySheet.props create mode 100644 packages/playground/windows/playground/ReactPackageProvider.cpp create mode 100644 packages/playground/windows/playground/ReactPackageProvider.h delete mode 100644 packages/playground/windows/playground/Utilities/RelayCommand.cpp delete mode 100644 packages/playground/windows/playground/Utilities/RelayCommand.h delete mode 100644 packages/playground/windows/playground/ViewLifetimeControl.cpp delete mode 100644 packages/playground/windows/playground/ViewLifetimeControl.h create mode 100644 packages/playground/windows/playground/nativeModules.g.h diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 7c8636ad4a8..4d6120ca2c8 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -172,6 +172,7 @@ jobs: /p:PreferredToolArchitecture=$(MSBuildPreferredToolArchitecture) /p:PlatformToolset=$(MSBuildPlatformToolset) /p:BaseIntDir=$(BaseIntDir) + /p:AppxPackageSigningEnabled=false - task: NuGetCommand@2 displayName: NuGet restore - Playground Win32 @@ -196,18 +197,6 @@ jobs: /p:PlatformToolset=$(MSBuildPlatformToolset) /p:BaseIntDir=$(BaseIntDir) - - task: CmdLine@2 - displayName: Create Playground bundle - inputs: - script: node node_modules/react-native/local-cli/cli.js bundle --entry-file Samples\index.tsx --bundle-output Playground.bundle - workingDirectory: packages\playground - - - task: CmdLine@2 - displayName: Create RNTester bundle - inputs: - script: node ../node_modules/react-native/local-cli/cli.js bundle --entry-file .\RNTester.js --bundle-output RNTester.windows.bundle --platform windows - workingDirectory: vnext - - job: RNWSampleAppsPR displayName: Sample Apps PR dependsOn: Setup diff --git a/change/@office-iss-react-native-win32-2020-04-09-09-01-15-msrnplayground.json b/change/@office-iss-react-native-win32-2020-04-09-09-01-15-msrnplayground.json new file mode 100644 index 00000000000..5921ba06029 --- /dev/null +++ b/change/@office-iss-react-native-win32-2020-04-09-09-01-15-msrnplayground.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "Bumping dev deps", + "packageName": "@office-iss/react-native-win32", + "email": "acoates@microsoft.com", + "dependentChangeType": "none", + "date": "2020-04-09T16:01:08.136Z" +} \ No newline at end of file diff --git a/change/react-native-windows-2020-04-09-09-01-15-msrnplayground.json b/change/react-native-windows-2020-04-09-09-01-15-msrnplayground.json new file mode 100644 index 00000000000..cf0122995ea --- /dev/null +++ b/change/react-native-windows-2020-04-09-09-01-15-msrnplayground.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "Bumping dev deps", + "packageName": "react-native-windows", + "email": "acoates@microsoft.com", + "dependentChangeType": "none", + "date": "2020-04-09T16:01:15.537Z" +} \ No newline at end of file diff --git a/packages/E2ETest/package.json b/packages/E2ETest/package.json index f4fa6b2fe27..6e818c78449 100644 --- a/packages/E2ETest/package.json +++ b/packages/E2ETest/package.json @@ -28,8 +28,8 @@ "rnpm-plugin-windows": "^0.6.1" }, "devDependencies": { - "@babel/core": "7.5.5", - "@babel/runtime": "7.5.5", + "@babel/core": "^7.8.4", + "@babel/runtime": "^7.8.4", "@types/jasmine": "2.8.7", "@types/node": "^10.14.8", "@types/react": "16.9.0", @@ -43,9 +43,9 @@ "@wdio/sync": "5.12.1", "appium": "1.14.1", "just-scripts": "^0.36.1", - "metro-react-native-babel-preset": "0.55.0", + "metro-react-native-babel-preset": "^0.56.0", "prettier": "^1.18.2", - "react-test-renderer": "16.8.6", + "react-test-renderer": "16.9.0", "rimraf": "^3.0.0", "ts-node": "^7.0.1", "tsconfig-paths": "^3.8.0", diff --git a/packages/microsoft-reactnative-sampleapps/package.json b/packages/microsoft-reactnative-sampleapps/package.json index e70517faaf7..fbaa86eaea8 100644 --- a/packages/microsoft-reactnative-sampleapps/package.json +++ b/packages/microsoft-reactnative-sampleapps/package.json @@ -20,12 +20,12 @@ "rnpm-plugin-windows": "^0.6.1" }, "devDependencies": { - "@babel/core": "7.5.5", - "@babel/runtime": "7.5.5", + "@babel/core": "^7.8.4", + "@babel/runtime": "^7.8.4", "@types/react": "16.9.0", "@types/react-native": "~0.61.5", "just-scripts": "^0.36.1", - "metro-react-native-babel-preset": "0.55.0", - "react-test-renderer": "16.8.6" + "metro-react-native-babel-preset": "^0.56.0", + "react-test-renderer": "16.9.0" } } diff --git a/packages/playground/.eslintignore b/packages/playground/.eslintignore deleted file mode 100644 index 600e365ec83..00000000000 --- a/packages/playground/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -**/node_modules \ No newline at end of file diff --git a/packages/playground/.eslintrc.js b/packages/playground/.eslintrc.js index e23962f3715..ed6f66be805 100644 --- a/packages/playground/.eslintrc.js +++ b/packages/playground/.eslintrc.js @@ -1,6 +1,6 @@ -module.exports = { - extends: "@react-native-community", +module.exports = { + extends: '@react-native-community', rules:{ "react-native/no-inline-styles" : 0, } -}; \ No newline at end of file +}; diff --git a/packages/playground/.gitignore b/packages/playground/.gitignore deleted file mode 100644 index bc578d1d660..00000000000 --- a/packages/playground/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules -/windows/playground/Generated Files/ -/build \ No newline at end of file diff --git a/packages/playground/.npmrc b/packages/playground/.npmrc deleted file mode 100644 index 9cf9495031e..00000000000 --- a/packages/playground/.npmrc +++ /dev/null @@ -1 +0,0 @@ -package-lock=false \ No newline at end of file diff --git a/packages/playground/README.md b/packages/playground/README.md index 8030a6be8cc..5d869967a0e 100644 --- a/packages/playground/README.md +++ b/packages/playground/README.md @@ -1,56 +1,53 @@ # Playground -Playground is a sample standalone application that shows usage of React Native for Windows vNext with several test scenarios. +Playground is a sample standalone application that allows testing of various JS files, including RNTester. ## Launching the app -1. Make sure your development machine has been set up with all the system requirements and dependencies mentioned [here](https://github.com/microsoft/react-native-windows/blob/master/vnext/docs/GettingStarted.md). Make sure a browser is launched and running. - -2. Open a command prompt in Administrator mode, navigate to the root folder and install React Native -`npm install -g react-native-cli` +1. Make sure your development machine has been set up with all the system requirements and dependencies mentioned [here](https://github.com/microsoft/react-native-windows/blob/master/vnext/docs/GettingStarted.md). Make sure a browser is launched and running. -3. Install React Native for Windows +1. Install Packages with-in the repo -`yarn add rnpm-plugin-windows` -`yarn install` +`yarn` -4. Ensure packages are built +1. Ensure packages are built `yarn build` -5. Navigate to the `playground` folder +1. Navigate to the `playground` folder `cd packages\playground` -6. Run the app +1. Run the app -`react-native run-windows` +`yarn windows` -This command will build and deploy the application along with launching Metro bundler and the dev tools. +This command will build and deploy the application along with launching Metro bundler and the dev tools. ## Using the app -You can find several sample .tsx files under the `/playground/samples` folder. You can load any of these files from the drop down at the top of the app, ensure the right App/component name has been picked for the sample on the drop down against "App Name". Click `Load` to load the .tsx file to the bottom pane. +You can find several sample .tsx files under the `/playground/samples` folder. You can load any of these files from the drop down at the top of the app, ensure the right App/component name has been picked for the sample on the drop down against "App Name". Click `Load` to load the .tsx file to the bottom pane. -You can edit the .tsx files for live reload. You can also add multiple React Native for Windows contents within the same app by clicking `+Pane` and loading a different .tsx file into each. +You can edit the .tsx files for fast refresh. -Use the toggles for Web debugger, Live Reload and Reuse Instance to change/test your scenarios. +Use the UI at the top of the playground application to modify the instance settings, then hit `Load` to run the instance. ## Editing the app -You can access and edit the .tsx files in the `/playground/samples` folder. Live reload should work as expected while editing the Typescript files. +You can access and edit the .tsx files in the `/playground/samples` folder. Fast Refresh should work as expected while editing the Typescript files. You can also launch `/playground/windows/playground.sln` solution file in Visual Studio and edit the native C++ code in the Playground Project. You will have to re-launch the app with the above steps if edits are made to the native app code. ## How to remote debug Playground -1. On your dev machine, open `packages/playground/windows/Playground.sln` -2. On your dev machine, run the metro bundler by doing `yarn start --host devMachineName` -3. On your target machine, run MSVSMon. This can be downloaded from [here](https://visualstudio.microsoft.com/downloads/#remote-tools-for-visual-studio-2019). - 1. I haven’t been able to figure out authentication so once you run msvsmon, click on `Options` and select no authentication. -4. Right click on the Playground project, Properties, Debugging - 1. Select Remote debugging, and enter the IP of the debug target - 2. In the command line arguments textbox, enter `devMachineName:8081` - 3. In the protocol dropdown, select no authentication -5. F5! This will build your playground app, and deploy to the target machine. -6. On the target, press `Load`. This will communicate back to the dev machine bundler and launch the web debugger on the dev machine, and serve the pages back to the app running in the target. -You need an updated version of the bundler in order for remote debugging to work properly: [PR here](https://github.com/react-native-community/cli/pull/829) + +1. On your dev machine, open `packages/playground/windows/Playground.sln` +2. On your dev machine, run the metro bundler by doing `yarn start --host devMachineName` +3. On your target machine, run MSVSMon. This can be downloaded from [here](https://visualstudio.microsoft.com/downloads/#remote-tools-for-visual-studio-2019). + 1. I haven’t been able to figure out authentication so once you run msvsmon, click on `Options` and select no authentication. +4. Right click on the Playground project, Properties, Debugging + 1. Select Remote debugging, and enter the IP of the debug target + 2. In the command line arguments textbox, enter `devMachineName:8081` + 3. In the protocol dropdown, select no authentication +5. F5! This will build your playground app, and deploy to the target machine. +6. On the target, press `Load`. This will communicate back to the dev machine bundler and launch the web debugger on the dev machine, and serve the pages back to the app running in the target. + You need an updated version of the bundler in order for remote debugging to work properly: [PR here](https://github.com/react-native-community/cli/pull/829) diff --git a/packages/playground/Samples/messages.tsx b/packages/playground/Samples/messages.tsx index dd9f9cdec73..7647a93ca48 100644 --- a/packages/playground/Samples/messages.tsx +++ b/packages/playground/Samples/messages.tsx @@ -73,10 +73,7 @@ var TextValues = [ 'Because if they had four, they would be chicken sedans!', ]; -var UserNameValues = [ - 'Parent', - 'Child', -]; +var UserNameValues = ['Parent', 'Child']; var AvatarValues = [ require('./images/blueuser.png'), @@ -112,7 +109,13 @@ function CreateMessage(id: number) { m.UserName = GetValue(id, UserNameValues); m.Avatar = GetValue(id, AvatarValues); m.Timestamp = new Date(new Date().getTime() + id * 60000); - m.Time = '' + m.Timestamp.getHours() % 12 + ':' + ('0' + m.Timestamp.getMinutes()).slice(-2) + ' ' + (m.Timestamp.getHours() > 12 ? 'PM' : 'AM' ); + m.Time = + '' + + (m.Timestamp.getHours() % 12) + + ':' + + ('0' + m.Timestamp.getMinutes()).slice(-2) + + ' ' + + (m.Timestamp.getHours() > 12 ? 'PM' : 'AM'); return m; } @@ -132,10 +135,16 @@ class MessageView extends React.Component { render() { return ( - + - {this.props.message.UserName} + + {this.props.message.UserName} + {this.props.message.Time} {this.props.message.Text} diff --git a/packages/playground/app.json b/packages/playground/app.json deleted file mode 100644 index f462299fae4..00000000000 --- a/packages/playground/app.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "playground", - "displayName": "playground" -} \ No newline at end of file diff --git a/packages/playground/babel.config.js b/packages/playground/babel.config.js new file mode 100644 index 00000000000..f842b77fcfb --- /dev/null +++ b/packages/playground/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['module:metro-react-native-babel-preset'], +}; diff --git a/packages/playground/just-task.js b/packages/playground/just-task.js index d99240b79b5..ad9f3c8a1b8 100644 --- a/packages/playground/just-task.js +++ b/packages/playground/just-task.js @@ -5,20 +5,7 @@ * @ts-check */ -const path = require('path'); -const { - task, - series, - option, - argv, - tscTask, - eslintTask, -} = require('just-scripts'); -const libPath = path.resolve(process.cwd(), 'lib'); -const srcPath = path.resolve(process.cwd(), 'src'); - -option('production'); -option('clean'); +const {task, series, eslintTask} = require('just-scripts'); task('eslint', () => { return eslintTask(); @@ -26,19 +13,6 @@ task('eslint', () => { task('eslint:fix', () => { return eslintTask({fix: true}); }); -task('ts', () => { - return tscTask({ - pretty: true, - noEmit: true, - ...(argv().production && { - inlineSources: true, - sourceRoot: path.relative(libPath, srcPath), - }), - target: 'es6', - module: 'commonjs', - }); -}); -task('build', series('ts')); task('lint', series('eslint')); task('lint:fix', series('eslint:fix')); diff --git a/packages/playground/metro.config.js b/packages/playground/metro.config.js index db67986a530..f019392ca1c 100644 --- a/packages/playground/metro.config.js +++ b/packages/playground/metro.config.js @@ -9,11 +9,11 @@ const path = require('path'); const blacklist = require('metro-config/src/defaults/blacklist'); const rnPath = fs.realpathSync( - fs.realpathSync( - path.resolve(require.resolve('react-native/package.json'), '..'), - ), + path.resolve(require.resolve('react-native/package.json'), '..'), +); +const rnwPath = fs.realpathSync( + path.resolve(require.resolve('react-native-windows/package.json'), '..'), ); -const rnwPath = path.resolve(__dirname, '../../vnext'); module.exports = { // WatchFolders is only needed due to the yarn workspace layout of node_modules, we need to watch the symlinked locations separately @@ -26,34 +26,22 @@ module.exports = { resolver: { extraNodeModules: { - // Redirect metro to rnwPath instead of node_modules/react-native-windows, since metro doesn't like symlinks + // Redirect react-native to react-native-windows 'react-native': rnwPath, 'react-native-windows': rnwPath, }, // Include the macos platform in addition to the defaults because the fork includes macos, but doesn't declare it platforms: ['ios', 'android', 'windesktop', 'windows', 'web', 'macos'], // Since there are multiple copies of react-native, we need to ensure that metro only sees one of them - // This should go away after RN 0.61 when haste is removed + // This should go in RN 0.61 when haste is removed blacklistRE: blacklist([ - new RegExp(`${path.resolve(rnPath)}.*`.replace(/[/\\]/g, '/')), - new RegExp( - `${path.resolve(rnwPath, 'node_modules/react-native')}.*`.replace( - /[/\\]/g, - '/', - ), - ), new RegExp( - `${path.resolve(rnwPath, 'ReactCopies')}.*`.replace(/[/\\]/g, '/'), - ), - new RegExp( - `${path.resolve( - require.resolve('@react-native-community/cli/package.json'), - '../node_modules/react-native', - )}.*`.replace(/[/\\]/g, '/'), + `${(path.resolve(rnPath) + path.sep).replace(/[/\\]/g, '/')}.*`, ), + // This stops "react-native run-windows" from causing the metro server to crash if its already running new RegExp( - `${path.resolve(__dirname, 'windows')}.*`.replace(/[/\\]/g, '/'), + `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`, ), ]), }, diff --git a/packages/playground/package.json b/packages/playground/package.json index a8a29efb693..101aa1ec034 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -3,27 +3,24 @@ "version": "0.0.54", "private": true, "scripts": { - "build": "just-scripts build", - "clean": "just-scripts clean", + "start": "react-native start", "lint:fix": "just-scripts lint:fix", "lint": "just-scripts lint", - "postinstall": "node postinstall.js", - "start": "react-native start", - "watch": "tsc -w" + "windows": "react-native run-windows" }, "dependencies": { "react": "16.9.0", "react-native": "0.61.5", - "react-native-windows": "0.0.0-master.26", - "rnpm-plugin-windows": "^0.6.1" + "react-native-windows": "0.0.0-master.26" }, "devDependencies": { - "@babel/core": "7.5.5", - "@babel/runtime": "7.5.5", + "@babel/core": "^7.8.4", + "@babel/runtime": "^7.8.4", "@types/react": "16.9.0", "@types/react-native": "~0.61.5", "just-scripts": "^0.36.1", - "metro-react-native-babel-preset": "0.55.0", - "react-test-renderer": "16.8.6" + "metro-react-native-babel-preset": "^0.56.0", + "react-test-renderer": "16.9.0", + "@react-native-community/eslint-config": "^1.0.0" } } diff --git a/packages/playground/packages.config b/packages/playground/packages.config index cdb7bb377d4..944c02938da 100644 --- a/packages/playground/packages.config +++ b/packages/playground/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/packages/playground/postinstall.js b/packages/playground/postinstall.js deleted file mode 100644 index ea656da5b18..00000000000 --- a/packages/playground/postinstall.js +++ /dev/null @@ -1,42 +0,0 @@ -/** - * The react-native cli getPlugins assumes that all the react-native platform packages - * are located in node_modules. - * - * When in a yarn workspace, the react-native platforms can be hoisted, so we need to - * add a link to the real location so that getPlugins works correctly. - * - * @format - * - */ -// @ts-check - -const fs = require('fs'); -const path = require('path'); -const os = require('os'); - -const checkOrCreate_node_modules = () => { - const p = path.join(__dirname, 'node_modules'); - - if (!fs.existsSync(p)) { - fs.mkdirSync(p); - } -}; -checkOrCreate_node_modules(); - -const link = (name, target) => { - const p = path.join(__dirname, 'node_modules', name); - - if (!fs.existsSync(p)) { - fs.symlinkSync(target, p, os.platform() === 'win32' ? 'junction' : 'dir'); - } -}; - -link('react-native-windows', path.resolve(__dirname, '../../vnext')); -link( - 'react-native', - path.resolve(require.resolve('react-native/package.json'), '..'), -); -link( - 'rnpm-plugin-windows', - path.resolve(require.resolve('rnpm-plugin-windows/package.json'), '..'), -); diff --git a/packages/playground/react-native.config.js b/packages/playground/react-native.config.js index 25b1f17a2da..fffebf99369 100644 --- a/packages/playground/react-native.config.js +++ b/packages/playground/react-native.config.js @@ -1,3 +1,7 @@ +const fs = require('fs'); +const path = require('path'); module.exports = { - reactNativePath: '../../vnext', + reactNativePath: fs.realpathSync( + path.resolve(require.resolve('react-native-windows/package.json'), '..'), + ), }; diff --git a/packages/playground/windows/.gitignore b/packages/playground/windows/.gitignore new file mode 100644 index 00000000000..4ea0c7b5a35 --- /dev/null +++ b/packages/playground/windows/.gitignore @@ -0,0 +1,92 @@ +*AppPackages* +*BundleArtifacts* + +#OS junk files +[Tt]humbs.db +*.DS_Store + +#Visual Studio files +*.[Oo]bj +*.user +*.aps +*.pch +*.vspscc +*.vssscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.[Cc]ache +*.ilk +*.log +*.lib +*.sbr +*.sdf +*.opensdf +*.opendb +*.unsuccessfulbuild +ipch/ +[Oo]bj/ +[Bb]in +[Dd]ebug*/ +[Rr]elease*/ +Ankh.NoLoad + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +#MonoDevelop +*.pidb +*.userprefs + +#Tooling +_ReSharper*/ +*.resharper +[Tt]est[Rr]esult* +*.sass-cache + +#Project files +[Bb]uild/ + +#Subversion files +.svn + +# Office Temp Files +~$* + +# vim Temp Files +*~ + +#NuGet +packages/ +*.nupkg + +#ncrunch +*ncrunch* +*crunch*.local.xml + +# visual studio database projects +*.dbmdl + +#Test files +*.testsettings + +#Other files +*.DotSettings +.vs/ +*project.lock.json + +#Files generated by the VS build +**/Generated Files/** + diff --git a/packages/playground/windows/playground.sln b/packages/playground/windows/playground.sln index b158b1fa829..51df10393e6 100644 --- a/packages/playground/windows/playground.sln +++ b/packages/playground/windows/playground.sln @@ -1,17 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground", "playground\Playground.vcxproj", "{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactUWP", "..\..\..\vnext\ReactUWP\ReactUWP.vcxproj", "{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "playground", "playground\playground.vcxproj", "{6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}" ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {F7D32BD0-2749-483E-9A0D-1635EF7E3136} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vnext\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" ProjectSection(ProjectDependencies) = postProject {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} @@ -22,123 +20,168 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\. {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{6F24927E-EE45-4DB2-91DA-DCC6E98B0C42}" - ProjectSection(SolutionItems) = preProject - ..\..\..\vnext\PropertySheets\ARM.props = ..\..\..\vnext\PropertySheets\ARM.props - ..\..\..\vnext\PropertySheets\Debug.props = ..\..\..\vnext\PropertySheets\Debug.props - ..\..\..\vnext\PropertySheets\React.Cpp.props = ..\..\..\vnext\PropertySheets\React.Cpp.props - ..\..\..\vnext\PropertySheets\Release.props = ..\..\..\vnext\PropertySheets\Release.props - ..\..\..\vnext\PropertySheets\Warnings.props = ..\..\..\vnext\PropertySheets\Warnings.props - ..\..\..\vnext\PropertySheets\Win32.props = ..\..\..\vnext\PropertySheets\Win32.props - ..\..\..\vnext\PropertySheets\x64.props = ..\..\..\vnext\PropertySheets\x64.props - ..\..\..\vnext\PropertySheets\x86.props = ..\..\..\vnext\PropertySheets\x86.props - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\..\..\vnext\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Shared", "..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems", "{0CC28589-39E4-4288-B162-97B959F8B843}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Universal", "..\..\..\vnext\JSI\Universal\JSI.Universal.vcxproj", "{A62D504A-16B8-41D2-9F19-E2E86019E5E4}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.ReactNative.SharedManaged", "..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.shproj", "{67A1076F-7790-4203-86EA-4402CCB5E782}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\..\..\vnext\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "..\..\..\vnext\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\..\vnext\Chakra\Chakra.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4 - ..\..\..\vnext\Shared\Shared.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4 + ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 + ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + ..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13 + ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6b6aa847-b32f-41ac-9d3b-48a8cdfa8ade}*SharedItemsImports = 4 + ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 + ..\..\..\vnext\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + ..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.ActiveCfg = Debug|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Build.0 = Debug|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Deploy.0 = Debug|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.ActiveCfg = Debug|x64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Build.0 = Debug|x64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Deploy.0 = Debug|x64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.ActiveCfg = Debug|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Build.0 = Debug|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Deploy.0 = Debug|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.ActiveCfg = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Build.0 = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Deploy.0 = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.ActiveCfg = Release|x64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Build.0 = Release|x64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Deploy.0 = Release|x64 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.ActiveCfg = Release|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Build.0 = Release|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Deploy.0 = Release|Win32 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|ARM.ActiveCfg = Debug|ARM + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|ARM.Build.0 = Debug|ARM + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|ARM.Deploy.0 = Debug|ARM + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|ARM64.Build.0 = Debug|ARM64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|x64.ActiveCfg = Debug|x64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|x64.Build.0 = Debug|x64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|x64.Deploy.0 = Debug|x64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|x86.ActiveCfg = Debug|Win32 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|x86.Build.0 = Debug|Win32 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Debug|x86.Deploy.0 = Debug|Win32 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|ARM.ActiveCfg = Release|ARM + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|ARM.Build.0 = Release|ARM + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|ARM.Deploy.0 = Release|ARM + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|ARM64.ActiveCfg = Release|ARM64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|ARM64.Build.0 = Release|ARM64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|ARM64.Deploy.0 = Release|ARM64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|x64.ActiveCfg = Release|x64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|x64.Build.0 = Release|x64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|x64.Deploy.0 = Release|x64 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|x86.ActiveCfg = Release|Win32 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|x86.Build.0 = Release|Win32 + {6B6AA847-B32F-41AC-9D3B-48A8CDFA8ADE}.Release|x86.Deploy.0 = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.ActiveCfg = Debug|ARM - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.Build.0 = Debug|ARM - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.ActiveCfg = Debug|x64 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.Build.0 = Debug|x64 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.ActiveCfg = Debug|Win32 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.Build.0 = Debug|Win32 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.ActiveCfg = Release|ARM - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.Build.0 = Release|ARM - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.ActiveCfg = Release|x64 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.Build.0 = Release|x64 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.ActiveCfg = Release|Win32 - {2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.Build.0 = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.Build.0 = Debug|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|ARM64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.Build.0 = Release|ARM64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 @@ -147,7 +190,21 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {11C084A3-A57C-4296-A679-CAC17B603144} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {A62D504A-16B8-41D2-9F19-E2E86019E5E4} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {67A1076F-7790-4203-86EA-4402CCB5E782} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F5EAF3BA-6B6F-4E81-B5C6-49B30EC0A32E} + SolutionGuid = {D43FAD39-F619-437D-BB40-04A3982ACB6A} EndGlobalSection EndGlobal diff --git a/packages/playground/windows/playground/App.cpp b/packages/playground/windows/playground/App.cpp new file mode 100644 index 00000000000..04ad962f094 --- /dev/null +++ b/packages/playground/windows/playground/App.cpp @@ -0,0 +1,104 @@ +#include "pch.h" + +#include "App.h" +#include "MainPage.h" + +using namespace winrt; +using namespace Windows::ApplicationModel; +using namespace Windows::ApplicationModel::Activation; +using namespace Windows::Foundation; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Navigation; +using namespace playground; +using namespace playground::implementation; + +/// +/// Initializes the singleton application object. This is the first line of authored code +/// executed, and as such is the logical equivalent of main() or WinMain(). +/// +App::App() { + InitializeComponent(); + Suspending({this, &App::OnSuspending}); + +#if defined _DEBUG && !defined DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION + UnhandledException([this](IInspectable const &, UnhandledExceptionEventArgs const &e) { + if (IsDebuggerPresent()) { + auto errorMessage = e.Message(); + __debugbreak(); + } + }); +#endif +} + +/// +/// Invoked when the application is launched normally by the end user. Other entry points +/// will be used such as when the application is launched to open a specific file. +/// +/// Details about the launch request and process. +void App::OnLaunched(LaunchActivatedEventArgs const &e) { + Frame rootFrame{nullptr}; + auto content = Window::Current().Content(); + if (content) { + rootFrame = content.try_as(); + } + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == nullptr) { + // Create a Frame to act as the navigation context and associate it with + // a SuspensionManager key + rootFrame = Frame(); + + rootFrame.NavigationFailed({this, &App::OnNavigationFailed}); + + if (e.PreviousExecutionState() == ApplicationExecutionState::Terminated) { + // Restore the saved session state only when appropriate, scheduling the + // final launch steps after the restore is complete + } + + if (e.PrelaunchActivated() == false) { + if (rootFrame.Content() == nullptr) { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(xaml_typename(), box_value(e.Arguments())); + } + // Place the frame in the current Window + Window::Current().Content(rootFrame); + // Ensure the current window is active + Window::Current().Activate(); + } + } else { + if (e.PrelaunchActivated() == false) { + if (rootFrame.Content() == nullptr) { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(xaml_typename(), box_value(e.Arguments())); + } + // Ensure the current window is active + Window::Current().Activate(); + } + } +} + +/// +/// Invoked when application execution is being suspended. Application state is saved +/// without knowing whether the application will be terminated or resumed with the contents +/// of memory still intact. +/// +/// The source of the suspend request. +/// Details about the suspend request. +void App::OnSuspending([[maybe_unused]] IInspectable const &sender, [[maybe_unused]] SuspendingEventArgs const &e) { + // Save application state and stop any background activity +} + +/// +/// Invoked when Navigation to a certain page fails +/// +/// The Frame which failed navigation +/// Details about the navigation failure +void App::OnNavigationFailed(IInspectable const &, NavigationFailedEventArgs const &e) { + throw hresult_error(E_FAIL, hstring(L"Failed to load Page ") + e.SourcePageType().Name); +} \ No newline at end of file diff --git a/packages/playground/windows/playground/App.h b/packages/playground/windows/playground/App.h new file mode 100644 index 00000000000..303240357f1 --- /dev/null +++ b/packages/playground/windows/playground/App.h @@ -0,0 +1,12 @@ +#pragma once +#include "App.xaml.g.h" + +namespace winrt::playground::implementation { +struct App : AppT { + App(); + + void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const &); + void OnSuspending(IInspectable const &, Windows::ApplicationModel::SuspendingEventArgs const &); + void OnNavigationFailed(IInspectable const &, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs const &); +}; +} // namespace winrt::playground::implementation diff --git a/packages/playground/windows/playground/App.idl b/packages/playground/windows/playground/App.idl new file mode 100644 index 00000000000..7f852d1682a --- /dev/null +++ b/packages/playground/windows/playground/App.idl @@ -0,0 +1,3 @@ +namespace playground +{ +} diff --git a/packages/playground/windows/playground/App.xaml b/packages/playground/windows/playground/App.xaml index 8b8630e46f9..31d31170016 100644 --- a/packages/playground/windows/playground/App.xaml +++ b/packages/playground/windows/playground/App.xaml @@ -1,10 +1,7 @@ - - - + xmlns:local="using:playground"> + diff --git a/packages/playground/windows/playground/App.xaml.cpp b/packages/playground/windows/playground/App.xaml.cpp deleted file mode 100644 index 055f5f0bfcf..00000000000 --- a/packages/playground/windows/playground/App.xaml.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -// App.xaml.cpp -// Implementation of the App class. -// - -#include "pch.h" - -#include "MainPage.xaml.h" - -using namespace Playground; - -using namespace Platform; -using namespace Windows::ApplicationModel; -using namespace Windows::ApplicationModel::Activation; -using namespace Windows::Foundation; -using namespace Windows::Foundation::Collections; -using namespace Windows::UI::Xaml; -using namespace Windows::UI::Xaml::Controls; -using namespace Windows::UI::Xaml::Controls::Primitives; -using namespace Windows::UI::Xaml::Data; -using namespace Windows::UI::Xaml::Input; -using namespace Windows::UI::Xaml::Interop; -using namespace Windows::UI::Xaml::Media; -using namespace Windows::UI::Xaml::Navigation; - -/// -/// Initializes the singleton application object. This is the first line of -/// authored code executed, and as such is the logical equivalent of main() or -/// WinMain(). -/// -App::App() { - InitializeComponent(); - Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); -} - -/// -/// Invoked when the application is launched normally by the end user. Other -/// entry points will be used such as when the application is launched to open a -/// specific file. -/// -/// Details about the launch request and process. -void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs ^ e) { -#if _DEBUG && _SHOWFRAMERATE - // Show graphics profiling information while debugging. - if (IsDebuggerPresent()) { - // Display the current frame rate counters - DebugSettings->EnableFrameRateCounter = true; - } -#endif - - auto rootFrame = dynamic_cast(Window::Current->Content); - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == nullptr) { - // Create a Frame to act as the navigation context and associate it with - // a SuspensionManager key - rootFrame = ref new Frame(); - - rootFrame->NavigationFailed += - ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler(this, &App::OnNavigationFailed); - - if (e->PreviousExecutionState == ApplicationExecutionState::Terminated) { - // TODO: Restore the saved session state only when appropriate, scheduling - // the final launch steps after the restore is complete - } - - if (rootFrame->Content == nullptr) { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a - // navigation parameter - rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments); - } - // Place the frame in the current Window - Window::Current->Content = rootFrame; - // Ensure the current window is active - Window::Current->Activate(); - } else { - if (rootFrame->Content == nullptr) { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a - // navigation parameter - rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments); - } - // Ensure the current window is active - Window::Current->Activate(); - } -} - -/// -/// Invoked when application execution is being suspended. Application -/// state is saved without knowing whether the application will be terminated or -/// resumed with the contents of memory still intact. -/// -/// The source of the suspend request. -/// Details about the suspend request. -void App::OnSuspending(Object ^ sender, SuspendingEventArgs ^ e) { - (void)sender; // Unused parameter - (void)e; // Unused parameter - - // TODO: Save application state and stop any background activity -} - -/// -/// Invoked when Navigation to a certain page fails -/// -/// The Frame which failed navigation -/// Details about the navigation failure -void App::OnNavigationFailed(Platform::Object ^ sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^ e) { - throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name); -} diff --git a/packages/playground/windows/playground/App.xaml.h b/packages/playground/windows/playground/App.xaml.h deleted file mode 100644 index 45b5167d3a8..00000000000 --- a/packages/playground/windows/playground/App.xaml.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// -// App.xaml.h -// Declaration of the App class. -// - -#pragma once - -#include "App.g.h" - -namespace Playground { -/// -/// Provides application-specific behavior to supplement the default Application -/// class. -/// -ref class App sealed { - protected: - virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs ^ e) override; - - internal : App(); - - private: - void OnSuspending(Platform::Object ^ sender, Windows::ApplicationModel::SuspendingEventArgs ^ e); - void OnNavigationFailed(Platform::Object ^ sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^ e); -}; -} // namespace Playground diff --git a/packages/playground/windows/playground/Bundle/.gitignore b/packages/playground/windows/playground/Bundle/.gitignore new file mode 100644 index 00000000000..d6b7ef32c84 --- /dev/null +++ b/packages/playground/windows/playground/Bundle/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/packages/playground/windows/playground/HostingPane.xaml b/packages/playground/windows/playground/HostingPane.xaml deleted file mode 100644 index eecaa3205e5..00000000000 --- a/packages/playground/windows/playground/HostingPane.xaml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -