diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index 778ddd9d7ec..9249134ecb7 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -39,10 +39,6 @@ steps: inputs: script: yarn ${{ parameters.yarnBuildCmd }} - - template: install-SDK.yml - parameters: - sdkVersion: $(Win10Version) - - task: PowerShell@2 displayName: List Visual Studio Components inputs: @@ -66,4 +62,4 @@ steps: inputs: targetType: inline # filePath | inline script: | - Get-WmiObject Win32_LogicalDisk \ No newline at end of file + Get-WmiObject Win32_LogicalDisk diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index d948377e78d..974e01791e2 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -96,10 +96,6 @@ steps: condition: and(succeeded(), eq('true', ${{ parameters.experimentalNugetDependency }})) - - template: install-SDK.yml - parameters: - sdkVersion: $(Win10Version) - - task: PowerShell@2 displayName: List Visual Studio Components inputs: @@ -140,8 +136,8 @@ steps: inputs: script: npx --no-install react-native bundle --entry-file index.js --platform windows --bundle-output test.bundle workingDirectory: $(Agent.BuildDirectory)\testcli - - # We are experiencing random package restore failures. + + # We are experiencing random package restore failures. # We want to uploading the vedaccio logs to aid in diagnosing if it is verdaccio or npmjs.org # To do so we have to kill the existing server because it keeps a file-lock on the log file - task: PowerShell@2 diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 8547a3f11ca..becb085e696 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -368,10 +368,6 @@ jobs: clean: false submodules: false - - task: VisualStudioTestPlatformInstaller@1 - inputs: - testPlatformVersion: 16.5.0 - - template: templates/build-rnw.yml parameters: yarnBuildCmd: build @@ -405,7 +401,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest - template: templates/stop-packagers.yml @@ -428,7 +424,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest otherConsoleOptions: '/blame -- RunConfiguration.TestSessionTimeout=300000' condition: and(succeeded(), ne(variables['BuildConfiguration'], 'Debug')) @@ -444,7 +440,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: false collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest otherConsoleOptions: '/ListTests' condition: failed() @@ -460,7 +456,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest otherConsoleOptions: '/blame -- RunConfiguration.TestSessionTimeout=300000' condition: failed() diff --git a/change/react-native-windows-2020-05-26-19-03-03-fixcommon.json b/change/react-native-windows-2020-05-26-19-03-03-fixcommon.json new file mode 100644 index 00000000000..1d09f47fc32 --- /dev/null +++ b/change/react-native-windows-2020-05-26-19-03-03-fixcommon.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Remove references to ReactWindowsCore projects", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-27T02:03:03.319Z" +} diff --git a/docs/project-structure.md b/docs/project-structure.md index cf1c30fc369..baad3e75798 100644 --- a/docs/project-structure.md +++ b/docs/project-structure.md @@ -23,7 +23,6 @@ Sample applications are not covered. - [Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.csproj](#Microsoft.ReactNative.Managed) - [Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems](#Microsoft.ReactNative.SharedManaged) - [ReactCommon\ReactCommon.vcxproj](#ReactCommon) -- [ReactWindowsCore\ReactWindowsCore.vcxproj](#ReactWindowsCore) - [Shared\Shared.vcxitems](#Shared) ## Common Projects @@ -32,10 +31,6 @@ Sample applications are not covered. *Static Library*
Functionality shared between React and JSI projects that do not depend on React or JSI functionality. -### ReactWindowsCore -*Static Library*
-Contains common functionality for both Desktop and Universal Windows variants. - ### Shared *Shared Items (no build artifact)*
Holds sources common to both Windows variants, that require different build configuration @@ -45,7 +40,7 @@ Holds sources common to both Windows variants, that require different build conf *Static Library*
React Native core, cross-platform C++ types and interfaces.
Sources provided as part of the `react-native` Node dependency. Not part of this repository.
-See https://github.com/facebook/react-native/tree/v0.59.9/ReactCommon. +See https://github.com/facebook/react-native/tree/v0.62.0/ReactCommon. ### Folly *Static Library*
@@ -79,9 +74,9 @@ Common framework for running out of process and/or full React instance testing. ### IntegrationTests (Node Project) *MSBuild Node project. For reading/editing purposes only (no build artifact)*
-Set of JavaScript component tests for [RNTester](https://github.com/facebook/react-native/tree/v0.59.9/RNTester). +Set of JavaScript component tests for [RNTester](https://github.com/facebook/react-native/tree/v0.62.0/RNTester). Sources provided as part of the `react-native` Node dependency. Not part of this repository.
-See https://github.com/facebook/react-native/tree/v0.59.9/IntegrationTests. +See https://github.com/facebook/react-native/tree/v0.62.0/IntegrationTests. ## Windows Desktop Projects @@ -126,4 +121,4 @@ The primary Windows Universal entry point and public API surface for React Nativ ### JSI.Universal *Static Library*
-Chakra based JSI::Runtime implementation. \ No newline at end of file +Chakra based JSI::Runtime implementation. diff --git a/packages/E2ETest/windows/ReactUWPTestApp.sln b/packages/E2ETest/windows/ReactUWPTestApp.sln index d9a745fa941..ce0f75e8a03 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp.sln +++ b/packages/E2ETest/windows/ReactUWPTestApp.sln @@ -10,11 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {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 PropertySheets\ARM.props = PropertySheets\ARM.props @@ -41,7 +36,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Manag EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 ..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 @@ -92,22 +86,6 @@ Global {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 {ABBB0407-0E82-486F-94CE-710900FCAADC}.Debug|ARM.ActiveCfg = Debug|ARM {ABBB0407-0E82-486F-94CE-710900FCAADC}.Debug|ARM.Build.0 = Debug|ARM {ABBB0407-0E82-486F-94CE-710900FCAADC}.Debug|ARM.Deploy.0 = Debug|ARM @@ -203,7 +181,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} - {11C084A3-A57C-4296-A679-CAC17B603144} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {A62D504A-16B8-41D2-9F19-E2E86019E5E4} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln index fa268b1004d..120f05548bf 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln @@ -16,11 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject 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}" @@ -50,7 +45,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{47eec7f3-40d3-49ba-82c1-eaf103b54215}*SharedItemsImports = 4 ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 @@ -156,22 +150,6 @@ Global {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 @@ -275,7 +253,6 @@ Global 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} diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index 969d4742d16..fbec06c55dd 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -12,11 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject 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}" @@ -38,7 +33,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{8b88ffae-4dbc-49a2-afa5-d2477d4ad189}*SharedItemsImports = 4 @@ -102,18 +96,6 @@ Global {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|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|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|x64.ActiveCfg = Debug|x64 @@ -157,7 +139,6 @@ Global 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} diff --git a/packages/playground/windows/playground.sln b/packages/playground/windows/playground.sln index 62a9c082eae..f50430efee0 100644 --- a/packages/playground/windows/playground.sln +++ b/packages/playground/windows/playground.sln @@ -15,11 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject 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}" @@ -43,7 +38,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\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 @@ -156,30 +150,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.WinUI3|x64.Build.0 = WinUI3|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.WinUI3|x86.ActiveCfg = WinUI3|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.WinUI3|x86.Build.0 = WinUI3|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 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM.ActiveCfg = WinUI3|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM.Build.0 = WinUI3|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM64.ActiveCfg = WinUI3|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM64.Build.0 = WinUI3|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x64.ActiveCfg = WinUI3|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x64.Build.0 = WinUI3|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x86.ActiveCfg = WinUI3|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x86.Build.0 = WinUI3|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 @@ -259,7 +229,6 @@ Global 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} diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 5376bcd160f..d22504c5f79 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -41,7 +41,7 @@ - $(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(IncludePath) + $(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon;$(IncludePath) true @@ -258,5 +260,6 @@ + \ No newline at end of file diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index 3e4342ebdf5..bea5b07f285 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index 50daf51be20..d94e1d0535d 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -11,6 +11,9 @@ + + + @@ -21,6 +24,7 @@ + @@ -31,6 +35,7 @@ + diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index 1b350bfb5f4..a3b0143f3f8 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -33,11 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", " 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.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" -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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.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 @@ -124,8 +120,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 @@ -148,14 +142,14 @@ Global 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 + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM @@ -287,22 +281,6 @@ Global {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 @@ -347,7 +325,6 @@ Global {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} diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index e04f8ea4126..cebe9a51dd2 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -623,9 +623,6 @@ {a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd} - - {11c084a3-a57c-4296-a679-cac17b603144} - diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters index e681fc4bfd3..908a649aad5 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters @@ -92,6 +92,9 @@ Modules + + Modules + Modules @@ -267,7 +270,9 @@ Modules - + + Modules + Modules diff --git a/vnext/PropertySheets/ReactDirectories.props b/vnext/PropertySheets/ReactDirectories.props index f338975ec22..67e5449c251 100644 --- a/vnext/PropertySheets/ReactDirectories.props +++ b/vnext/PropertySheets/ReactDirectories.props @@ -15,14 +15,17 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\ + $(ReactNativeWindowsDir) + $([MSBuild]::NormalizeDirectory($(RootDir)\build)) + $([MSBuild]::NormalizeDirectory($(RootDir)\target)) - $(ReactNativeWindowsDir)build\$(Platform)\$(Configuration) - $(ReactNativeWindowsDir)build\x86\$(Configuration) - $(ReactNativeWindowsDir)target\$(Platform)\$(Configuration) - $(ReactNativeWindowsDir)target\x86\$(Configuration) + $(RootIntDir)\$(Platform)\$(Configuration) + $(RootIntDir)\x86\$(Configuration) + $(RootOutDir)\$(Platform)\$(Configuration) + $(RootOutDir)\x86\$(Configuration) - $(BaseIntDir)\$(ProjectName)\ - $(BaseOutDir)\$(ProjectName)\ + $([MSBuild]::NormalizeDirectory($(BaseIntDir)\$(ProjectName)\)) + $([MSBuild]::NormalizeDirectory($(BaseOutDir)\$(ProjectName)\)) $(IntDir)Generated Files\ $(IntDir)\react-native-patched\ diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index a0e57180bbd..3128f3a6d64 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -189,6 +189,8 @@ + + diff --git a/vnext/ReactUWP/Base/CoreUIManagers.cpp b/vnext/ReactUWP/Base/CoreUIManagers.cpp index 9185caf1491..517f27ccc87 100644 --- a/vnext/ReactUWP/Base/CoreUIManagers.cpp +++ b/vnext/ReactUWP/Base/CoreUIManagers.cpp @@ -3,10 +3,10 @@ #include "pch.h" +#include #include #include #include -#include // Standard View Managers #include diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index f670a822e00..e85d543e442 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -9,13 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore-Desktop", "ReactWindowsCore\ReactWindowsCore-Desktop.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.DLL", "Desktop.DLL\React.Windows.Desktop.DLL.vcxproj", "{88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}" ProjectSection(ProjectDependencies) = postProject {74085F13-2DDE-45E5-A0CA-927AC9D0B953} = {74085F13-2DDE-45E5-A0CA-927AC9D0B953} @@ -25,7 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.DLL", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.UnitTests", "Desktop.UnitTests\React.Windows.Desktop.UnitTests.vcxproj", "{96CD24DC-91C2-480A-BC26-EE2250DA80D7}" ProjectSection(ProjectDependencies) = postProject - {11C084A3-A57C-4296-A679-CAC17B603144} = {11C084A3-A57C-4296-A679-CAC17B603144} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EEE39425-10FD-4DB3-924E-D31CDA3DCC73}" @@ -41,7 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FollyWin32", "FollyWin32\Fo EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{6F24927E-EE45-4DB2-91DA-DCC6E98B0C42}" ProjectSection(SolutionItems) = preProject - PropertySheets\ARM.props = PropertySheets\ARM.props PropertySheets\Debug.props = PropertySheets\Debug.props PropertySheets\React.Cpp.props = PropertySheets\React.Cpp.props PropertySheets\Release.props = PropertySheets\Release.props @@ -53,7 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertyS EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibrary", "{43A78B84-278B-4B99-8887-4029D551173E}" ProjectSection(SolutionItems) = preProject - PropertySheets\StaticLibrary\ARM.props = PropertySheets\StaticLibrary\ARM.props PropertySheets\StaticLibrary\Debug.props = PropertySheets\StaticLibrary\Debug.props PropertySheets\StaticLibrary\Release.props = PropertySheets\StaticLibrary\Release.props PropertySheets\StaticLibrary\Win32.props = PropertySheets\StaticLibrary\Win32.props @@ -63,7 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibr EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{102E37B8-4BE5-4DC1-A650-16706EFB3306}" ProjectSection(SolutionItems) = preProject - PropertySheets\Application\ARM.props = PropertySheets\Application\ARM.props PropertySheets\Application\Debug.props = PropertySheets\Application\Debug.props PropertySheets\Application\Release.props = PropertySheets\Application\Release.props PropertySheets\Application\Win32.props = PropertySheets\Application\Win32.props @@ -73,7 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLibrary", "{2EB5E646-7EB4-4FED-B1A8-0AEEF2D32268}" ProjectSection(SolutionItems) = preProject - PropertySheets\DynamicLibrary\ARM.props = PropertySheets\DynamicLibrary\ARM.props PropertySheets\DynamicLibrary\Debug.props = PropertySheets\DynamicLibrary\Debug.props PropertySheets\DynamicLibrary\Release.props = PropertySheets\DynamicLibrary\Release.props PropertySheets\DynamicLibrary\Win32.props = PropertySheets\DynamicLibrary\Win32.props @@ -81,7 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLi PropertySheets\DynamicLibrary\x86.props = PropertySheets\DynamicLibrary\x86.props EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop", "Desktop\React.Windows.Desktop.vcxproj", "{95048601-C3DC-475F-ADF8-7C0C764C10D5}" EndProject @@ -122,8 +110,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 JSI\Shared\JSI.Shared.vcxitems*{17dd1b17-3094-40dd-9373-ac2497932eca}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 @@ -159,14 +145,6 @@ Global {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|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|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 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.ActiveCfg = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.Build.0 = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.ActiveCfg = Debug|Win32 @@ -269,6 +247,14 @@ Global {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 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.ActiveCfg = Debug|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.Build.0 = Debug|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.ActiveCfg = Debug|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.Build.0 = Debug|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.ActiveCfg = Release|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.Build.0 = Release|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.ActiveCfg = Release|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index 54461ce713d..c9c174eb78e 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -9,13 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore-UWP", "ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {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 PropertySheets\ARM.props = PropertySheets\ARM.props @@ -103,8 +96,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 @@ -166,22 +157,6 @@ Global {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 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.ActiveCfg = Debug|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp index db03d075c63..f08358fdadb 100644 --- a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp +++ b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp @@ -242,7 +242,7 @@ AsyncStorageModuleWin32::~AsyncStorageModuleWin32() { // condition_variable for the async task to acknowledge cancellation by // nulling out m_action. Once m_action is null, it is safe to proceed // wth closing the DB connection - winrt::slim_shared_lock_guard guard{m_lock}; + winrt::slim_lock_guard guard{m_lock}; swap(tasks, m_tasks); if (m_action) { m_action.Cancel(); diff --git a/vnext/ReactWindowsCore/Pch/pch.cpp b/vnext/ReactWindowsCore/Pch/pch.cpp deleted file mode 100644 index b175e3fd200..00000000000 --- a/vnext/ReactWindowsCore/Pch/pch.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include "pch.h" diff --git a/vnext/ReactWindowsCore/Pch/pch.h b/vnext/ReactWindowsCore/Pch/pch.h deleted file mode 100644 index 3d53c320d24..00000000000 --- a/vnext/ReactWindowsCore/Pch/pch.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#pragma once - -#ifdef WINRT -#include "CppWinRTIncludes.h" -#endif - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - -#ifndef WINRT_LEAN_AND_MEAN -#define WINRT_LEAN_AND_MEAN -#endif - -#include - -#include diff --git a/vnext/ReactWindowsCore/README.md b/vnext/ReactWindowsCore/README.md new file mode 100644 index 00000000000..aac59aca8ba --- /dev/null +++ b/vnext/ReactWindowsCore/README.md @@ -0,0 +1,4 @@ +# DO NOT ADD NEW SOURCES INTO THIS DIRECTORY + +This directory will be removed, and its sources will be relocated.\ +It is kept for compatibility purposes and is scheduled for removal when React Native Windows moves to React Native 0.63. diff --git a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj deleted file mode 100644 index 5ff28843410..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - {11C084A3-A57C-4296-A679-CAC17B603144} - - - true - false - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj.filters b/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj.filters deleted file mode 100644 index f50dbb16b99..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj.filters +++ /dev/null @@ -1,291 +0,0 @@ - - - - - {06a27269-2c1f-418a-9e70-82d17deb7de2} - - - {32892a40-82db-4c1b-9390-5893f9ddbb0b} - - - {afc5d1fe-6d70-4040-a72b-036ffa74a2eb} - - - {81319f88-192e-40cf-bc1c-76a84bf37ccd} - - - {6e20d3aa-721b-4f62-a1aa-ec6af1a114fb} - - - {b8d1b3de-1573-4d49-a26f-99892413a797} - - - {efe7ad3d-598a-4633-a2b7-2de458833b88} - - - {2b4f6cca-9c7e-4bf1-9711-829006f0be1e} - - - {43770517-0df1-4cff-bd30-563b9d0f56e7} - - - {eae44522-b665-4bd2-85f2-8ca26f4ce15f} - - - {8b1364fc-cc9f-4ca9-834b-894849d8b487} - - - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Pch - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Tracing - - - Source Files\Modules - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - etw - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files - - - Header Files - - - Header Files\Pch - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Tracing - - - Header Files\Modules - - - Header Files\Modules - - - Header Files - - - - - etw - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems deleted file mode 100644 index 33ab3bf1087..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems +++ /dev/null @@ -1,246 +0,0 @@ - - - - {11c084a3-a57c-4296-a679-cac17b603145} - StaticLibrary - ReactWindowsCore - true - Windows Store - 10.0 - - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - x64 - - - Release - x64 - - - Debug - Win32 - - - Release - Win32 - - - WinUI3 - ARM - - - WinUI3 - ARM64 - - - WinUI3 - Win32 - - - WinUI3 - x64 - - - - - - StaticLibrary - - - - - - - - - - x86-windows - x64-windows - arm-windows - arm64-windows - - - false - {11C084A3-A57C-4296-A679-CAC17B603145} - - - - Use - pch.h - false - true - - - REACTWINDOWS_BUILD; - NOMINMAX; - FOLLY_NO_CONFIG; - WIN32=0; - RN_EXPORT=; - CHAKRACORE; - %(PreprocessorDefinitions) - - - $(ReactNativeWindowsDir); - $(ReactNativeWindowsDir)Common; - $(ReactNativeWindowsDir)Shared; - $(ReactNativeWindowsDir)include\ReactWindowsCore; - $(ReactNativeDir)\ReactCommon; - $(ReactNativeDir)\ReactCommon\callinvoker; - $(JSI_Source); - $(ReactNativeWindowsDir)JSI\Shared; - $(ReactNativeWindowsDir)stubs; - $(FollyDir); - $(ReactNativeWindowsDir)\ReactWindowsCore\pch; - $(ReactNativeWindowsDir)\ReactWindowsCore\tracing; - $(ReactNativeWindowsDir)\Mso; - %(AdditionalIncludeDirectories) - - $(HERMES_Package)\installed\$(VcpkgTriplet)\include\;%(AdditionalIncludeDirectories) - /await %(AdditionalOptions) - false - - - false - false - - - $(HERMES_Package)\installed\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - hermes.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj deleted file mode 100644 index 5c753af0f91..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - {11C084A3-A57C-4296-A679-CAC17B603144} - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters deleted file mode 100644 index 580e25fe2cb..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters +++ /dev/null @@ -1,285 +0,0 @@ - - - - - {06a27269-2c1f-418a-9e70-82d17deb7de2} - - - {32892a40-82db-4c1b-9390-5893f9ddbb0b} - - - {afc5d1fe-6d70-4040-a72b-036ffa74a2eb} - - - {81319f88-192e-40cf-bc1c-76a84bf37ccd} - - - {6e20d3aa-721b-4f62-a1aa-ec6af1a114fb} - - - {b8d1b3de-1573-4d49-a26f-99892413a797} - - - {efe7ad3d-598a-4633-a2b7-2de458833b88} - - - {2b4f6cca-9c7e-4bf1-9711-829006f0be1e} - - - {43770517-0df1-4cff-bd30-563b9d0f56e7} - - - {eae44522-b665-4bd2-85f2-8ca26f4ce15f} - - - {8b1364fc-cc9f-4ca9-834b-894849d8b487} - - - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Pch - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Tracing - - - Source Files\Modules - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - etw - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files - - - Header Files - - - Header Files\Pch - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Tracing - - - Header Files\Modules - - - Header Files\Modules - - - - - etw - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp b/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp index b54dfd69eaa..361f706fdb1 100644 --- a/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp +++ b/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp @@ -8,6 +8,7 @@ #include // Windows API +#include #include #include diff --git a/vnext/ReactWindowsCore/packages.ReactWindowsCore-Desktop.config b/vnext/ReactWindowsCore/packages.ReactWindowsCore-Desktop.config deleted file mode 100644 index 9d410408cf0..00000000000 --- a/vnext/ReactWindowsCore/packages.ReactWindowsCore-Desktop.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/packages.config b/vnext/ReactWindowsCore/packages.config deleted file mode 100644 index cdb7bb377d4..00000000000 --- a/vnext/ReactWindowsCore/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index 4d31e11fc82..330d7977125 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -4,6 +4,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true {2049dbe9-8d13-42c9-ae4b-413ae38fffd0} + Microsoft.ReactNative.Shared @@ -14,13 +15,101 @@ + + + + + + + + + true + + + + + + + true + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters index b740492c183..44c9f4dcd68 100644 --- a/vnext/Shared/Shared.vcxitems.filters +++ b/vnext/Shared/Shared.vcxitems.filters @@ -1,22 +1,302 @@  - - - - AsyncStorage + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\tracing + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Modules + + + Source Files + + + Source Files + + + Source Files + + + Source Files - - + + {87359046-466f-4c83-856e-1755bcb1c066} + + + {d297c8b2-b89e-46e9-8d7c-ee4766384cb5} + + {83a6224b-fdbc-49fa-83d4-c9010f17bffa} + + {ee633764-9967-4233-8848-81edf1488790} + + + {5862fbd1-2e67-4c90-9e58-24a66d71aec4} + + + {37d57028-146d-45f3-a56d-2ce7625a3449} + + + {da7f5a49-e3fb-46c3-906d-be42b8b651f7} + + + {87b365df-267b-4c00-860a-53d129a65a4e} + + + {6008bddc-9f23-4190-9eea-662fb1ab2467} + + + {6d6b7412-d407-4ee3-be2a-addd9dba140a} + + + {5e38b06d-5bcb-437b-9a9b-e787e37ef3ee} + - AsyncStorage + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\etw + + + Header Files\Modules + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\tracing + + + Header Files\Pch + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\Modules + + + + + Source Files\etw + + + Source Files\etw + + + Source Files\etw + + + Source Files\etw + \ No newline at end of file diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj index 16787e7827c..6138c659f1e 100644 --- a/vnext/Test/React.Windows.Test.vcxproj +++ b/vnext/Test/React.Windows.Test.vcxproj @@ -38,7 +38,7 @@ - $(IncludePath) + $(ReactNativeWindowsDir)ReactWindowsCore;$(IncludePath) diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln index 7cb1e156625..b3fa7ba9c78 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln @@ -15,11 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modu {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\node_modules\react-native-windows\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" @@ -123,22 +118,6 @@ Global {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 @@ -194,7 +173,6 @@ Global 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} diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln index e5afcd89a31..c621b140192 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln @@ -12,7 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modu {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\node_modules\react-native-windows\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" ProjectSection(ProjectDependencies) = postProject {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection @@ -115,22 +114,6 @@ Global {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 @@ -202,7 +185,6 @@ Global 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}