From ddd115b5a38992b11ba33d3a9e04ece1bff79a44 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 17 Jun 2021 15:58:47 -0700 Subject: [PATCH 01/81] Create cswinrt projection nuget project --- vnext/ExperimentalFeatures.props | 5 + .../Microsoft.ProjectReunion.ReactNative.sln | 148 ++++++++++++++++++ .../Directory.Build.props | 8 + ...icrosoft.ProjectReunion.ReactNative.csproj | 34 ++++ .../Microsoft.ReactNative.Interop.nuspec | 25 +++ 5 files changed, 220 insertions(+) create mode 100644 vnext/ExperimentalFeatures.props create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative.sln create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props new file mode 100644 index 00000000000..2d53f5087bc --- /dev/null +++ b/vnext/ExperimentalFeatures.props @@ -0,0 +1,5 @@ + + + true + + \ No newline at end of file diff --git a/vnext/Microsoft.ProjectReunion.ReactNative.sln b/vnext/Microsoft.ProjectReunion.ReactNative.sln new file mode 100644 index 00000000000..53c7707221f --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative.sln @@ -0,0 +1,148 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31410.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ProjectReunion.ReactNative", "Microsoft.ProjectReunion.ReactNative\Microsoft.ProjectReunion.ReactNative.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject +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}") = "ReactCommon", "ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.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|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|ARM64.ActiveCfg = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|ARM64.Build.0 = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x64.ActiveCfg = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x64.Build.0 = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x86.ActiveCfg = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x86.Build.0 = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|ARM64.ActiveCfg = Release|Any CPU + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|ARM64.Build.0 = Release|Any CPU + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x64.ActiveCfg = Release|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x64.Build.0 = Release|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x86.ActiveCfg = Release|Any CPU + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x86.Build.0 = Release|Any CPU + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Deploy.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Build.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32 + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Deploy.0 = Release|Win32 + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Deploy.0 = Release|Win32 + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Deploy.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F633EDF9-1BF7-4A0C-B5C3-53B94A024548} + EndGlobalSection +EndGlobal diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props b/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props new file mode 100644 index 00000000000..4b0f55ded87 --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props @@ -0,0 +1,8 @@ + + + $([MSBuild]::NormalizeDirectory('$(SolutionDir)build', '$(Platform)', '$(Configuration)'))\Microsoft.ProjectReunion.ReactNative + $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'bin')) + $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'obj')) + + + \ No newline at end of file diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj new file mode 100644 index 00000000000..9e22b49ae49 --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -0,0 +1,34 @@ + + + net5.0-windows10.0.19041.0 + x64 + + + + Microsoft.ReactNative + $(OutDir) + + + + + + + + + + + + + + + + + + + + ..\nuget\ + $(GeneratedNugetDir)Microsoft.ReactNative.Interop.nuspec + $(GeneratedNugetDir) + true + + diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec new file mode 100644 index 00000000000..6d8dfd76ba3 --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec @@ -0,0 +1,25 @@ + + + + Microsoft.ReactNative + 0.0.1-prerelease + Microsoft + React Native for Windows + + + + + + + + + + + + + + + + + + \ No newline at end of file From c03fc5c9ad6c68fbf80366f39ab7502654a62a67 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 17 Jun 2021 16:11:54 -0700 Subject: [PATCH 02/81] nuget package builds --- .../Microsoft.ProjectReunion.ReactNative.csproj | 4 ++-- ...nuspec => Microsoft.ProjectReunion.ReactNative.nuspec} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename vnext/Microsoft.ProjectReunion.ReactNative/{Microsoft.ReactNative.Interop.nuspec => Microsoft.ProjectReunion.ReactNative.nuspec} (79%) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index 9e22b49ae49..1395fa34004 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -26,8 +26,8 @@ - ..\nuget\ - $(GeneratedNugetDir)Microsoft.ReactNative.Interop.nuspec + .\nuget\ + Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) true diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec similarity index 79% rename from vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec rename to vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec index 6d8dfd76ba3..379caf1047b 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec @@ -1,7 +1,7 @@ - + - Microsoft.ReactNative + Microsoft.ProjectReunion.ReactNative 0.0.1-prerelease Microsoft React Native for Windows @@ -19,7 +19,7 @@ - + - \ No newline at end of file + From aaf257abe31e7507ea22373731aeebfd6d8526fb Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:07:58 -0700 Subject: [PATCH 03/81] use 1.3.0 and reunion 0.8 preview --- .../Microsoft.ProjectReunion.ReactNative.csproj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index 1395fa34004..d687d225609 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -10,14 +10,13 @@ - - + - - - + + + From a2ed12f20eae9433118abee90d48a77d4af00675 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:30:52 -0700 Subject: [PATCH 04/81] publish artifact with reunion nupkg --- .ado/jobs/universal.yml | 17 ++++++++++++++++- .../Microsoft.ProjectReunion.ReactNative.csproj | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index efb6f0c64be..9e579e6bb28 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,7 +102,22 @@ - template: ../templates/component-governance.yml - + - template: ../templates/build-rnw.yml + parameters: + project: vnext/Microsoft.ProjectReunion.ReactNative.sln + buildPlatform: x64 + buildConfiguration: Release + multicoreBuild: true + msbuildArguments: /p:RNW_FASTBUILD=${{ matrix.FastBuild }} /p:UseWinUI3=true + displayName: Build ProjectReunion x64 Release + + - task: PublishPipelineArtifact@1 + displayName: "Publish Reunion nuget package" + inputs: + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + artifactName: "ProjectReunion-x64-Release" + + - job: UniversalTest${{ matrix.Name }} variables: - template: ../variables/vs2019.yml diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index d687d225609..a7f8272bf20 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -1,4 +1,4 @@ - + net5.0-windows10.0.19041.0 x64 @@ -25,7 +25,7 @@ - .\nuget\ + ..\target\$(Platform)\$(Configuration)\ Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) true From ffebae65a62af66548b10ce73f4c97ac2b43f807 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:31:31 -0700 Subject: [PATCH 05/81] Change files --- ...ative-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json diff --git a/change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json b/change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json new file mode 100644 index 00000000000..db29e65518a --- /dev/null +++ b/change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Create cswinrt projection nuget project", + "packageName": "react-native-windows", + "email": "asklar@microsoft.com", + "dependentChangeType": "patch" +} From 13adfb9b1df57c69b73c3baa232e895a917f99e3 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:58:57 -0700 Subject: [PATCH 06/81] > --- .ado/jobs/universal.yml | 50 ++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 9e579e6bb28..198358f6adf 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,20 +102,44 @@ - template: ../templates/component-governance.yml - - template: ../templates/build-rnw.yml - parameters: - project: vnext/Microsoft.ProjectReunion.ReactNative.sln - buildPlatform: x64 - buildConfiguration: Release - multicoreBuild: true - msbuildArguments: /p:RNW_FASTBUILD=${{ matrix.FastBuild }} /p:UseWinUI3=true - displayName: Build ProjectReunion x64 Release + - ${{ if eq(matrix.BuildPlatform, 'x64') and eq (matrix.BuildConfiguration, 'Release') }}: + - task: VSBuild@1 + displayName: Reunion ${{parameters.project}} + inputs: + solution: vnext/Microsoft.ProjectReunion.ReactNative.sln + platform: x64 + configuration: Release + clean: false # Optional + maximumCpuCount: true # Optional + restoreNugetPackages: true # Optional + createLogFile: true + logFileVerbosity: detailed + msbuildArgs: + /p:PreferredToolArchitecture=x64 + /p:PlatformToolset=x64 + /p:BaseIntDir=$(BaseIntDir) + /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" + /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" + /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" + /p:PublishToolDuringBuild=true + /p:EnableSourceLink=true + /bl:$(BuildLogDirectory)\MsBuild.binlog + /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err + /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn + /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log + /p:RNW_FASTBUILD=true + /p:UseWinUI3=true - - task: PublishPipelineArtifact@1 - displayName: "Publish Reunion nuget package" - inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg - artifactName: "ProjectReunion-x64-Release" + - template: upload-build-logs.yml + parameters: + buildLogDirectory: $(BuildLogDirectory) + + - task: PublishPipelineArtifact@1 + displayName: "Publish Reunion NuGet package" + inputs: + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + artifactName: "ProjectReunion-x64-Release" - job: UniversalTest${{ matrix.Name }} From 2fc6f78aab17ef40a4a24ba456da116b01f33e61 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:00:16 -0700 Subject: [PATCH 07/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 198358f6adf..6e9f592dc01 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,7 +102,7 @@ - template: ../templates/component-governance.yml - - ${{ if eq(matrix.BuildPlatform, 'x64') and eq (matrix.BuildConfiguration, 'Release') }}: + - ${{ if eq(matrix.BuildPlatform, 'x64') and eq(matrix.BuildConfiguration, 'Release') }}: - task: VSBuild@1 displayName: Reunion ${{parameters.project}} inputs: From 6d20f74daa3a87b7b0212ca6974db9d2ea7dd880 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:03:48 -0700 Subject: [PATCH 08/81] > --- .ado/jobs/universal.yml | 76 +++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 6e9f592dc01..e049239503b 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,45 +102,47 @@ - template: ../templates/component-governance.yml - - ${{ if eq(matrix.BuildPlatform, 'x64') and eq(matrix.BuildConfiguration, 'Release') }}: - - task: VSBuild@1 - displayName: Reunion ${{parameters.project}} - inputs: - solution: vnext/Microsoft.ProjectReunion.ReactNative.sln - platform: x64 - configuration: Release - clean: false # Optional - maximumCpuCount: true # Optional - restoreNugetPackages: true # Optional - createLogFile: true - logFileVerbosity: detailed - msbuildArgs: - /p:PreferredToolArchitecture=x64 - /p:PlatformToolset=x64 - /p:BaseIntDir=$(BaseIntDir) - /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" - /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" - /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" - /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" - /p:PublishToolDuringBuild=true - /p:EnableSourceLink=true - /bl:$(BuildLogDirectory)\MsBuild.binlog - /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err - /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn - /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - /p:RNW_FASTBUILD=true - /p:UseWinUI3=true - - - template: upload-build-logs.yml - parameters: - buildLogDirectory: $(BuildLogDirectory) + - task: VSBuild@1 + displayName: Reunion ${{parameters.project}} + inputs: + solution: vnext/Microsoft.ProjectReunion.ReactNative.sln + platform: x64 + configuration: Release + clean: false # Optional + maximumCpuCount: true # Optional + restoreNugetPackages: true # Optional + createLogFile: true + logFileVerbosity: detailed + msbuildArgs: + /p:PreferredToolArchitecture=x64 + /p:PlatformToolset=x64 + /p:BaseIntDir=$(BaseIntDir) + /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" + /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" + /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" + /p:PublishToolDuringBuild=true + /p:EnableSourceLink=true + /bl:$(BuildLogDirectory)\MsBuild.binlog + /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err + /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn + /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log + /p:RNW_FASTBUILD=true + /p:UseWinUI3=true + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + - - task: PublishPipelineArtifact@1 - displayName: "Publish Reunion NuGet package" - inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg - artifactName: "ProjectReunion-x64-Release" + - template: upload-build-logs.yml + parameters: + buildLogDirectory: $(BuildLogDirectory) + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + - task: PublishPipelineArtifact@1 + displayName: "Publish Reunion NuGet package" + inputs: + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + artifactName: "ProjectReunion-x64-Release" + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - job: UniversalTest${{ matrix.Name }} variables: From ca859b1abb90e20c44b5b4fb81dd6c078b336ef6 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:05:32 -0700 Subject: [PATCH 09/81] > --- .ado/jobs/universal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index e049239503b..b760d99f8e8 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -103,12 +103,12 @@ - template: ../templates/component-governance.yml - task: VSBuild@1 - displayName: Reunion ${{parameters.project}} + displayName: Reunion X64Release inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln platform: x64 configuration: Release - clean: false # Optional + clean: true # Optional maximumCpuCount: true # Optional restoreNugetPackages: true # Optional createLogFile: true From 7f2f43835a17185287846a41880da8e5ef86bca1 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:07:18 -0700 Subject: [PATCH 10/81] > --- .ado/jobs/universal.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index b760d99f8e8..145b5bbcbfe 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -104,6 +104,7 @@ - task: VSBuild@1 displayName: Reunion X64Release + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln platform: x64 @@ -114,28 +115,27 @@ createLogFile: true logFileVerbosity: detailed msbuildArgs: + /p:RNW_FASTBUILD=true + /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 /p:PlatformToolset=x64 /p:BaseIntDir=$(BaseIntDir) - /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" - /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" - /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" - /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" - /p:PublishToolDuringBuild=true - /p:EnableSourceLink=true - /bl:$(BuildLogDirectory)\MsBuild.binlog - /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err - /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn - /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - /p:RNW_FASTBUILD=true - /p:UseWinUI3=true - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" + # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" + # /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" + # /p:PublishToolDuringBuild=true + # /p:EnableSourceLink=true + # /bl:$(BuildLogDirectory)\MsBuild.binlog + # /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err + # /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn + # /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - template: upload-build-logs.yml + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) parameters: buildLogDirectory: $(BuildLogDirectory) - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - task: PublishPipelineArtifact@1 displayName: "Publish Reunion NuGet package" From db3ccd55d9d7b4b4e9b0627ba6a3c6915f92cb70 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:08:30 -0700 Subject: [PATCH 11/81] > --- .ado/jobs/universal.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 145b5bbcbfe..2607255901b 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -132,10 +132,10 @@ # /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - - template: upload-build-logs.yml - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - parameters: - buildLogDirectory: $(BuildLogDirectory) + # - template: upload-build-logs.yml + # condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + # parameters: + # buildLogDirectory: $(BuildLogDirectory) - task: PublishPipelineArtifact@1 displayName: "Publish Reunion NuGet package" From 59811ff113caef7a5e66e8777da86b2a0e6ac8ad Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:09:33 -0700 Subject: [PATCH 12/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 2607255901b..9af93906594 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -119,7 +119,7 @@ /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 /p:PlatformToolset=x64 - /p:BaseIntDir=$(BaseIntDir) + # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" From 058fbcf8752599a1e565eacfa6047b70e31e7436 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:50:31 -0700 Subject: [PATCH 13/81] > --- .ado/jobs/universal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 9af93906594..0e4f83131f2 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -107,6 +107,7 @@ condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln + vsVersion: $(MSBuildVersion) platform: x64 configuration: Release clean: true # Optional From c1492df69d8958d5bdb8e3d4ded2d574492ea02a Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 02:26:09 -0700 Subject: [PATCH 14/81] > --- .ado/jobs/universal.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 0e4f83131f2..1c7a2b20f52 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -107,12 +107,12 @@ condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln - vsVersion: $(MSBuildVersion) + vsVersion: 16.0 platform: x64 configuration: Release clean: true # Optional maximumCpuCount: true # Optional - restoreNugetPackages: true # Optional + restoreNugetPackages: false # Optional createLogFile: true logFileVerbosity: detailed msbuildArgs: @@ -120,6 +120,7 @@ /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 /p:PlatformToolset=x64 + /restore # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" From c2cdf51301e19a6a09095c44ae80f359b04dc43c Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 03:04:43 -0700 Subject: [PATCH 15/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 1c7a2b20f52..43dca7ecabc 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -119,7 +119,7 @@ /p:RNW_FASTBUILD=true /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 - /p:PlatformToolset=x64 + /p:PlatformToolset=v142 /restore # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" From d7692a27f0240adc79e09de8a405da6dfd26c669 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 05:26:34 -0700 Subject: [PATCH 16/81] > --- .ado/jobs/universal.yml | 4 ++-- .../Microsoft.ProjectReunion.ReactNative.csproj | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 43dca7ecabc..4e7888d784a 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -121,8 +121,8 @@ /p:PreferredToolArchitecture=x64 /p:PlatformToolset=v142 /restore + /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:BaseIntDir=$(BaseIntDir) - # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" # /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" @@ -142,7 +142,7 @@ - task: PublishPipelineArtifact@1 displayName: "Publish Reunion NuGet package" inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VERSION_STR).nupkg artifactName: "ProjectReunion-x64-Release" condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index a7f8272bf20..3da9b7d7a7d 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -25,6 +25,7 @@ + $(RNW_PKG_VERSION_STR) ..\target\$(Platform)\$(Configuration)\ Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) From a8b6ec468e31c96bb67ab1ccd261ecfe3e762557 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 08:42:03 -0700 Subject: [PATCH 17/81] > --- .../Microsoft.ProjectReunion.ReactNative.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec index 379caf1047b..4256c4f188f 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec @@ -2,7 +2,7 @@ Microsoft.ProjectReunion.ReactNative - 0.0.1-prerelease + $version$ Microsoft React Native for Windows From 3d5afe8d9d6855933007306f926935b159320d55 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 10:31:30 -0700 Subject: [PATCH 18/81] > --- .ado/jobs/universal.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 4e7888d784a..5a9c8f7a304 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,6 +102,10 @@ - template: ../templates/component-governance.yml + - template: set-version-vars.yml + parameters: + buildEnvironment: ${{ parameters.buildEnvironment }} + - task: VSBuild@1 displayName: Reunion X64Release condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) From 34f97938d56611dbf302734f618bb69a1a01f9ae Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 11:01:04 -0700 Subject: [PATCH 19/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 5a9c8f7a304..c99eea2acfb 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,7 +102,7 @@ - template: ../templates/component-governance.yml - - template: set-version-vars.yml + - template: ../templates/set-version-vars.yml parameters: buildEnvironment: ${{ parameters.buildEnvironment }} From c69b19007ac4492c55687ef45949c54d13a0e20e Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 11:45:04 -0700 Subject: [PATCH 20/81] > --- .ado/jobs/universal.yml | 2 +- .../Microsoft.ProjectReunion.ReactNative.csproj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index c99eea2acfb..2b73341d12e 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -125,7 +125,7 @@ /p:PreferredToolArchitecture=x64 /p:PlatformToolset=v142 /restore - /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + /p:Version=$(RNW_PKG_VERSION_STR) # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index 3da9b7d7a7d..a7f8272bf20 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -25,7 +25,6 @@ - $(RNW_PKG_VERSION_STR) ..\target\$(Platform)\$(Configuration)\ Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) From f6005ebc5d51f0414a54670cc1c26d3371b20b52 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 13:44:38 -0700 Subject: [PATCH 21/81] split reunion into its own stage --- .ado/jobs/project-reunion.yml | 57 +++++++++++++++++++ .ado/stages.yml | 6 +- ... Microsoft.ReactNative.ProjectReunion.sln} | 2 +- .../Directory.Build.props | 0 ...crosoft.ReactNative.ProjectReunion.csproj} | 2 +- ...crosoft.ReactNative.ProjectReunion.nuspec} | 2 +- 6 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 .ado/jobs/project-reunion.yml rename vnext/{Microsoft.ProjectReunion.ReactNative.sln => Microsoft.ReactNative.ProjectReunion.sln} (98%) rename vnext/{Microsoft.ProjectReunion.ReactNative => Microsoft.ReactNative.ProjectReunion}/Directory.Build.props (100%) rename vnext/{Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj => Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj} (95%) rename vnext/{Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec => Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec} (93%) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml new file mode 100644 index 00000000000..5e948f2d5ff --- /dev/null +++ b/.ado/jobs/project-reunion.yml @@ -0,0 +1,57 @@ +parameters: + - name: buildEnvironment + type: string + default : PullRequest + values: + - PullRequest + - Continuous + +jobs: + - job: Reunion + displayName: Project Reunion + variables: + - template: ../variables/vs2019.yml + + strategy: + matrix: + # ${{ if eq(parameters.buildEnvironment, 'Continuous') }}: + x64Release: + BuildConfiguration: Release + BuildPlatform: x64 + # X86Debug: + # BuildConfiguration: Debug + # BuildPlatform: x86 + + pool: $(AgentPool.Medium) + timeoutInMinutes: 60 # how long to run the job before automatically cancelling + cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them + + steps: + - checkout: self + clean: false + submodules: false + + - template: ../templates/apply-published-version-vars.yml + + - template: ../templates/build-rnw.yml + parameters: + project: vnext/Microsoft.ReactNative.ProjectReunion.sln + buildPlatform: $(BuildPlatform) + buildConfiguration: $(BuildConfiguration) + msbuildArguments: /p:UseWinUI3=true + + - task: CopyFiles@2 + displayName: Copy NuGet artifacts + inputs: + sourceFolder: $(Build.SourcesDirectory)/vnext/target/${{ parameters.buildPlatform }}/${{ parameters.buildConfiguration }} + targetFolder: $(Build.StagingDirectory)/nuget + contents: Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VER_STR).nupkg + + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact: Project Reunion" + inputs: + artifactName: ReactWindows + pathToPublish: $(Build.StagingDirectory) + parallel: true + + - template: ../templates/component-governance.yml diff --git a/.ado/stages.yml b/.ado/stages.yml index 9c4c4772c56..c8d56de3d5a 100644 --- a/.ado/stages.yml +++ b/.ado/stages.yml @@ -19,9 +19,13 @@ stages: - template: jobs/desktop.yml parameters: buildEnvironment: ${{ parameters.buildEnvironment }} - + - template: jobs/nuget-desktop.yml + - template: jobs/project-reunion.yml + parameters: + buildEnvironment: ${{ parameters.buildEnvironment }} + - template: jobs/cli-init.yml parameters: # The Nuget CLI verification is part of 'Build' to speed up the verification diff --git a/vnext/Microsoft.ProjectReunion.ReactNative.sln b/vnext/Microsoft.ReactNative.ProjectReunion.sln similarity index 98% rename from vnext/Microsoft.ProjectReunion.ReactNative.sln rename to vnext/Microsoft.ReactNative.ProjectReunion.sln index 53c7707221f..4feaac2635c 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.ProjectReunion.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31410.357 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ProjectReunion.ReactNative", "Microsoft.ProjectReunion.ReactNative\Microsoft.ProjectReunion.ReactNative.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.ProjectReunion", "Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" EndProject diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props b/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props similarity index 100% rename from vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props rename to vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj similarity index 95% rename from vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj rename to vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index a7f8272bf20..d40bb0f087b 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -26,7 +26,7 @@ ..\target\$(Platform)\$(Configuration)\ - Microsoft.ProjectReunion.ReactNative.nuspec + Microsoft.ReactNative.ProjectReunion.nuspec $(GeneratedNugetDir) true diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec similarity index 93% rename from vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec rename to vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec index 4256c4f188f..69c312192ec 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec @@ -10,7 +10,7 @@ - + From 3ca3c7b5c56e9946f449219b650b48487ec56f71 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 14:06:18 -0700 Subject: [PATCH 22/81] > --- .ado/jobs/project-reunion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 5e948f2d5ff..3c0ea2e0b26 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -38,7 +38,7 @@ jobs: project: vnext/Microsoft.ReactNative.ProjectReunion.sln buildPlatform: $(BuildPlatform) buildConfiguration: $(BuildConfiguration) - msbuildArguments: /p:UseWinUI3=true + msbuildArguments: /p:UseWinUI3=true /p:Version=$(RNW_PKG_VERSION_STR) - task: CopyFiles@2 displayName: Copy NuGet artifacts From fb3eaf61919b4e006dd6b1b73042c371ff181c76 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 14:15:22 -0700 Subject: [PATCH 23/81] > --- .ado/jobs/project-reunion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 3c0ea2e0b26..31214d1f7f0 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -43,7 +43,7 @@ jobs: - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: - sourceFolder: $(Build.SourcesDirectory)/vnext/target/${{ parameters.buildPlatform }}/${{ parameters.buildConfiguration }} + sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) targetFolder: $(Build.StagingDirectory)/nuget contents: Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VER_STR).nupkg From c374781e49767d485816b03b2677168e28e84453 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 16:11:11 -0700 Subject: [PATCH 24/81] > --- .ado/jobs/project-reunion.yml | 16 ++++++- .ado/publish.yml | 48 +++++++++++++++++++ .ado/templates/prep-and-pack-nuget.yml | 12 +++++ vnext/ExperimentalFeatures.props | 2 +- .../Directory.Build.props | 2 +- ...icrosoft.ReactNative.ProjectReunion.csproj | 17 +++++-- ...icrosoft.ReactNative.ProjectReunion.nuspec | 25 ---------- ...icrosoft.ReactNative.ProjectReunion.nuspec | 25 ++++++++++ 8 files changed, 115 insertions(+), 32 deletions(-) delete mode 100644 vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec create mode 100644 vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 31214d1f7f0..b1c5bd0902b 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -38,7 +38,21 @@ jobs: project: vnext/Microsoft.ReactNative.ProjectReunion.sln buildPlatform: $(BuildPlatform) buildConfiguration: $(BuildConfiguration) - msbuildArguments: /p:UseWinUI3=true /p:Version=$(RNW_PKG_VERSION_STR) + msbuildArguments: /p:UseWinUI3=true + + - task: NuGetToolInstaller@0 + inputs: + versionSpec: ">=5.8.0" + + - template: ../templates/prep-and-pack-nuget.yml + parameters: + packDesktop: false + packMicrosoftReactNative: false + packMicrosoftReactNativeCxx: false + packMicrosoftReactNativeManaged: false + packMicrosoftReactNativeManagedCodeGen: false + packMicrosoftReactNativeProjectReunion: true + slices: '("x64.Release")' - task: CopyFiles@2 displayName: Copy NuGet artifacts diff --git a/.ado/publish.yml b/.ado/publish.yml index ec9fa7e019e..fa44b668186 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -278,11 +278,58 @@ jobs: SearchPattern: vnext/target/**/*.pdb SymbolServerType: TeamServices + - job: RnwNativeBuildReunion + displayName: Build Reunion + dependsOn: RnwNpmPublish + strategy: + matrix: + X64Release: + BuildConfiguration: Release + BuildPlatform: x64 + + pool: + vmImage: $(VmImage) + + steps: + - template: templates/apply-published-version-vars.yml + + - template: templates/build-rnw.yml + parameters: + project: vnext/Microsoft.ReactNative.ProjectReunion.sln + buildPlatform: $(BuildPlatform) + buildConfiguration: $(BuildConfiguration) + msbuildArguments: /p:UseWinUI3=true + + - template: templates/publish-build-artifacts-for-nuget.yml + parameters: + artifactName: ReactWindows + buildPlatform: $(BuildPlatform) + buildConfiguration: $(BuildConfiguration) + layoutHeaders: eq('true', variables['LayoutHeaders']) + contents: | + Microsoft.ReactNative.ProjectReunion\** + + # Ensure EnableCodesign is set properly so CG fails appropriately + - script: | + echo ##vso[task.setvariable variable=EnableCodesign]true + displayName: Set EnableCodesign + condition: or(eq(variables['EnableCodesign'], 'true'), and(endsWith(variables['Build.SourceBranchName'], '-stable'), not(${{ parameters.skipStableCodesign }}))) + + - template: templates/component-governance.yml + + # Make symbols available through http://symweb. + - task: PublishSymbols@2 + displayName: Publish symbols + inputs: + SearchPattern: vnext/target/**/*.pdb + SymbolServerType: TeamServices + - job: RNWNuget dependsOn: - RnwNpmPublish - RnwNativeBuildDesktop - RnwNativeBuildUniversal + - RnwNativeBuildReunion displayName: Sign Binaries and Publish NuGet pool: vmImage: $(VmImage) @@ -301,6 +348,7 @@ jobs: parameters: publishCommitId: $(publishCommitId) npmVersion: $(npmVersion) + packMicrosoftReactNativeProjectReunion: true ${{ if or(eq(variables['EnableCodesign'], 'true'), and(endsWith(variables['Build.SourceBranchName'], '-stable'), not(parameters.skipStableCodesign))) }}: # Sign on stable release builds signMicrosoft: true diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 64e6117dec6..005edcbc318 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -11,6 +11,7 @@ parameters: packMicrosoftReactNativeCxx: true packMicrosoftReactNativeManaged: true packMicrosoftReactNativeManagedCodeGen: true + packMicrosoftReactNativeProjectReunion: false signMicrosoft: false steps: @@ -81,3 +82,14 @@ steps: buildProperties: CommitId=${{parameters.publishCommitId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=x64 codesignBinaries: ${{ parameters.signMicrosoft }} codesignNuget: ${{ parameters.signMicrosoft }} + + - ${{ if eq(parameters.packMicrosoftReactNativeProjectReunion, true) }}: + - template: prep-and-pack-single.yml + parameters: + packageId: Microsoft.ReactNative.ProjectReunion + packageVersion: ${{parameters.npmVersion}} + slices: '' + buildProperties: CommitId=${{parameters.publishCommitId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=x64 + codesignBinaries: ${{ parameters.signMicrosoft }} + codesignNuget: ${{ parameters.signMicrosoft }} + diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props index 2d53f5087bc..67abaab20dc 100644 --- a/vnext/ExperimentalFeatures.props +++ b/vnext/ExperimentalFeatures.props @@ -1,5 +1,5 @@ - + true \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props b/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props index 4b0f55ded87..4cdf7ef186f 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props @@ -1,6 +1,6 @@ - $([MSBuild]::NormalizeDirectory('$(SolutionDir)build', '$(Platform)', '$(Configuration)'))\Microsoft.ProjectReunion.ReactNative + $([MSBuild]::NormalizeDirectory('$(SolutionDir)build', '$(Platform)', '$(Configuration)'))\Microsoft.ReactNative.ProjectReunion $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'bin')) $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'obj')) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index d40bb0f087b..9f39c1664f5 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -25,9 +25,18 @@ - ..\target\$(Platform)\$(Configuration)\ - Microsoft.ReactNative.ProjectReunion.nuspec - $(GeneratedNugetDir) - true + + false + + + + + + + diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec deleted file mode 100644 index 69c312192ec..00000000000 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - Microsoft.ProjectReunion.ReactNative - $version$ - Microsoft - React Native for Windows - - - - - - - - - - - - - - - - - - diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec new file mode 100644 index 00000000000..3dc429803d8 --- /dev/null +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -0,0 +1,25 @@ + + + + Microsoft.ProjectReunion.ReactNative + $version$ + Microsoft + React Native for Windows for Project Reunion apps + + + + + + + + + + + + + + + + + + From ee78a60f3eaa8a6c038f56cc8ab8582e4e01bbf0 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 16:39:48 -0700 Subject: [PATCH 25/81] > --- .../Microsoft.ReactNative.ProjectReunion.nuspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec index 3dc429803d8..e16a534c420 100644 --- a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -16,10 +16,10 @@ - - - - - + + + + + From 91fd3ac181860830f1645e81fa813b4ee22a8cd1 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 17:04:58 -0700 Subject: [PATCH 26/81] > --- .ado/jobs/project-reunion.yml | 28 ++++++++++---------- .ado/jobs/universal.yml | 48 ----------------------------------- 2 files changed, 14 insertions(+), 62 deletions(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index b1c5bd0902b..1341a8ad4ea 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -40,20 +40,6 @@ jobs: buildConfiguration: $(BuildConfiguration) msbuildArguments: /p:UseWinUI3=true - - task: NuGetToolInstaller@0 - inputs: - versionSpec: ">=5.8.0" - - - template: ../templates/prep-and-pack-nuget.yml - parameters: - packDesktop: false - packMicrosoftReactNative: false - packMicrosoftReactNativeCxx: false - packMicrosoftReactNativeManaged: false - packMicrosoftReactNativeManagedCodeGen: false - packMicrosoftReactNativeProjectReunion: true - slices: '("x64.Release")' - - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: @@ -68,4 +54,18 @@ jobs: pathToPublish: $(Build.StagingDirectory) parallel: true + - task: NuGetToolInstaller@0 + inputs: + versionSpec: ">=5.8.0" + + - template: ../templates/prep-and-pack-nuget.yml + parameters: + packDesktop: false + packMicrosoftReactNative: false + packMicrosoftReactNativeCxx: false + packMicrosoftReactNativeManaged: false + packMicrosoftReactNativeManagedCodeGen: false + packMicrosoftReactNativeProjectReunion: true + slices: '("x64.Release")' + - template: ../templates/component-governance.yml diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 2b73341d12e..062b2e4141e 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,54 +102,6 @@ - template: ../templates/component-governance.yml - - template: ../templates/set-version-vars.yml - parameters: - buildEnvironment: ${{ parameters.buildEnvironment }} - - - task: VSBuild@1 - displayName: Reunion X64Release - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - inputs: - solution: vnext/Microsoft.ProjectReunion.ReactNative.sln - vsVersion: 16.0 - platform: x64 - configuration: Release - clean: true # Optional - maximumCpuCount: true # Optional - restoreNugetPackages: false # Optional - createLogFile: true - logFileVerbosity: detailed - msbuildArgs: - /p:RNW_FASTBUILD=true - /p:UseWinUI3=true - /p:PreferredToolArchitecture=x64 - /p:PlatformToolset=v142 - /restore - /p:Version=$(RNW_PKG_VERSION_STR) - # /p:BaseIntDir=$(BaseIntDir) - # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" - # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" - # /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" - # /p:PublishToolDuringBuild=true - # /p:EnableSourceLink=true - # /bl:$(BuildLogDirectory)\MsBuild.binlog - # /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err - # /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn - # /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - - - # - template: upload-build-logs.yml - # condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - # parameters: - # buildLogDirectory: $(BuildLogDirectory) - - - task: PublishPipelineArtifact@1 - displayName: "Publish Reunion NuGet package" - inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VERSION_STR).nupkg - artifactName: "ProjectReunion-x64-Release" - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - - job: UniversalTest${{ matrix.Name }} variables: - template: ../variables/vs2019.yml From 2de32bc0fdfb01e2e893205b438a7ccedabb16df Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 19:07:07 -0700 Subject: [PATCH 27/81] > --- vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec index e16a534c420..f19c38bbc71 100644 --- a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -1,7 +1,7 @@ - Microsoft.ProjectReunion.ReactNative + Microsoft.ReactNative.ProjectReunion $version$ Microsoft React Native for Windows for Project Reunion apps @@ -16,6 +16,7 @@ + From ea1581cef9a037c3347182f31cf762f074dbc425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 10:15:53 -0500 Subject: [PATCH 28/81] =?UTF-8?q?=F0=9F=93=A6=20Bump=20@types/chai=20from?= =?UTF-8?q?=204.2.18=20to=204.2.19=20(#8074)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.2.18 to 4.2.19. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai) --- updated-dependencies: - dependency-name: "@types/chai" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2b12a0620ff..ccaf9c02132 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1952,9 +1952,9 @@ "@types/responselike" "*" "@types/chai@^4.2.14": - version "4.2.18" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.18.tgz#0c8e298dbff8205e2266606c1ea5fbdba29b46e4" - integrity sha512-rS27+EkB/RE1Iz3u0XtVL5q36MGDWbgYe7zWiodyKNUnthxY0rukK5V36eiUCtCisB7NN8zKYH6DO2M37qxFEQ== + version "4.2.19" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.19.tgz#80f286b515897413c7a35bdda069cc80f2344233" + integrity sha512-jRJgpRBuY+7izT7/WNXP/LsMO9YonsstuL+xuvycDyESpoDoIAsMd7suwpB4h9oEWB+ZlPTqJJ8EHomzNhwTPQ== "@types/chalk@^2.2.0": version "2.2.0" From dba1d617ee60110f26891c0b701f818e5e91ea82 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 13:29:36 -0700 Subject: [PATCH 29/81] >> --- .ado/jobs/project-reunion.yml | 8 +++++--- .ado/templates/prep-and-pack-nuget.yml | 2 +- ...Microsoft.ReactNative.ProjectReunion.nuspec | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 1341a8ad4ea..fd01750c56f 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -41,11 +41,13 @@ jobs: msbuildArguments: /p:UseWinUI3=true - task: CopyFiles@2 - displayName: Copy NuGet artifacts + displayName: Copy artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.StagingDirectory)/nuget - contents: Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VER_STR).nupkg + targetFolder: $(Build.StagingDirectory)/reunion + contents: | + Microsoft.ReactNative\** + Microsoft.ReactNative.ProjectReunion\** - task: PublishBuildArtifacts@1 displayName: "Publish Artifact: Project Reunion" diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 005edcbc318..83d2d31f33c 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)) }}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec index f19c38bbc71..32f22b17991 100644 --- a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -2,6 +2,14 @@ Microsoft.ReactNative.ProjectReunion + https://github.com/microsoft/react-native-windows + true + MIT + © Microsoft Corporation. All rights reserved. + + react react-native react-native-windows microsoft c c++ cpp c# csharp reunion projectreunion $version$ Microsoft React Native for Windows for Project Reunion apps @@ -17,10 +25,10 @@ - - - - - + + + + + From 843cafea03bf6ae747d29cfc94c662ffc48f0f5d Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 13:43:13 -0700 Subject: [PATCH 30/81] >> --- .ado/publish.yml | 21 ++++++++++++++------- .ado/templates/prep-and-pack-nuget.yml | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index fa44b668186..e61b424c239 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -300,15 +300,22 @@ jobs: buildConfiguration: $(BuildConfiguration) msbuildArguments: /p:UseWinUI3=true - - template: templates/publish-build-artifacts-for-nuget.yml - parameters: - artifactName: ReactWindows - buildPlatform: $(BuildPlatform) - buildConfiguration: $(BuildConfiguration) - layoutHeaders: eq('true', variables['LayoutHeaders']) + - task: CopyFiles@2 + displayName: Copy NuGet artifacts + inputs: + sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) + targetFolder: $(Build.StagingDirectory)/reunion/${(BuildPlatform)/$(BuildConfiguration) contents: | + Microsoft.ReactNative\** Microsoft.ReactNative.ProjectReunion\** - + + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact: ReactWindows" + inputs: + artifactName: ReactWindows + pathToPublish: $(Build.StagingDirectory) + parallel: true + # Ensure EnableCodesign is set properly so CG fails appropriately - script: | echo ##vso[task.setvariable variable=EnableCodesign]true diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 83d2d31f33c..e81750b25cd 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} From 400da49f3ac17cd340f5f156b6307ec5102b07be Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 14:14:19 -0700 Subject: [PATCH 31/81] >> --- .ado/templates/prep-and-pack-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index e81750b25cd..2c2fd2ebee8 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true))}}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} From cbd81f3c1d41be5066e576e3217034d386375321 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 17:05:45 -0700 Subject: [PATCH 32/81] Block creating C# apps with Hermes (#8075) * Hermes cannot currently be used in C# apps, so blocking it in the CLI * Change files --- ...dows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json | 7 +++++++ packages/react-native-windows-init/src/Cli.ts | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json diff --git a/change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json b/change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json new file mode 100644 index 00000000000..2f3b3602fe4 --- /dev/null +++ b/change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Hermes cannot currently be used in C# apps, so blocking it in the CLI", + "packageName": "react-native-windows-init", + "email": "asklar@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-native-windows-init/src/Cli.ts b/packages/react-native-windows-init/src/Cli.ts index cdab694ad69..050fb5466a2 100644 --- a/packages/react-native-windows-init/src/Cli.ts +++ b/packages/react-native-windows-init/src/Cli.ts @@ -91,7 +91,7 @@ const argv = yargs useHermes: { type: 'boolean', describe: - 'Use Hermes instead of Chakra as the JS engine (supported on 0.64+)', + '[Experimental] Use Hermes instead of Chakra as the JS engine (supported on 0.64+ for C++ projects)', default: false, }, useWinUI3: { @@ -435,6 +435,14 @@ function isProjectUsingYarn(cwd: string): boolean { ); } + if (argv.useHermes && argv.language === 'cs') { + throw new CodedError( + 'IncompatibleOptions', + "Error: Incompatible options specified. Options '--useHermes' and '--language cs' are incompatible", + {detail: 'useHermes and C#'}, + ); + } + if (!useDevMode) { if (!version) { const rnVersion = getReactNativeVersion(); From 46cbceb816e78fa345be3c633328ea0829ee604b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20C=C3=A9sar=20Rocha?= Date: Mon, 21 Jun 2021 18:23:50 -0700 Subject: [PATCH 33/81] Have script store return nullptr on facebook::jsi::JSINativeException (#8068) * Return nullptr on facebook::jsi::JSINativeException * Change files * Remove unused exception name --- ...ative-windows-63ea3a71-e181-4a1e-a183-141818f55403.json | 7 +++++++ vnext/Shared/BaseScriptStoreImpl.cpp | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json diff --git a/change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json b/change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json new file mode 100644 index 00000000000..0f7aa03d6b8 --- /dev/null +++ b/change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Have script store return nullptr on facebook::jsi::JSINativeException", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Shared/BaseScriptStoreImpl.cpp b/vnext/Shared/BaseScriptStoreImpl.cpp index 26b15bf5958..2e14686856b 100644 --- a/vnext/Shared/BaseScriptStoreImpl.cpp +++ b/vnext/Shared/BaseScriptStoreImpl.cpp @@ -147,7 +147,11 @@ std::unique_ptr LocalFileSimpleBufferStore::getBuffer(const s } if (Microsoft::React::GetRuntimeOptionBool("JSI.MemoryMappedScriptStore")) { - return Microsoft::JSI::MakeMemoryMappedBuffer(winrt::to_hstring(storeDirectory_ + bufferId).c_str()); + try { + return Microsoft::JSI::MakeMemoryMappedBuffer(winrt::to_hstring(storeDirectory_ + bufferId).c_str()); + } catch (const facebook::jsi::JSINativeException &) { + return nullptr; + } } else { // Treat buffer id as the relative path fragment. std::ifstream file(storeDirectory_ + bufferId, std::ios::binary | std::ios::ate); From 4316bbe6a52c4e09b3a72760cdaff4b3c9bafb33 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 18:24:21 -0700 Subject: [PATCH 34/81] >>> --- .ado/jobs/project-reunion.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index fd01750c56f..42a0039034d 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -11,7 +11,6 @@ jobs: displayName: Project Reunion variables: - template: ../variables/vs2019.yml - strategy: matrix: # ${{ if eq(parameters.buildEnvironment, 'Continuous') }}: @@ -41,10 +40,10 @@ jobs: msbuildArguments: /p:UseWinUI3=true - task: CopyFiles@2 - displayName: Copy artifacts + displayName: Copy NuGet artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.StagingDirectory)/reunion + targetFolder: $(Build.StagingDirectory)/reunion/$(BuildPlatform)/$(BuildConfiguration) contents: | Microsoft.ReactNative\** Microsoft.ReactNative.ProjectReunion\** @@ -70,4 +69,12 @@ jobs: packMicrosoftReactNativeProjectReunion: true slices: '("x64.Release")' + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact: Project Reunion NuGet" + inputs: + artifactName: ReunionNuGet + pathToPublish: $(Build.SourcesDirectory)/NugetRootFinal/Microsoft.ReactNative.ProjectReunion.0.0.1-pr.nupkg + parallel: true + + - template: ../templates/component-governance.yml From 023c70efbc2eb0472bd6ca0efa54084390bc72bc Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 21:22:57 -0700 Subject: [PATCH 35/81] pr feedback --- .ado/templates/prep-and-pack-nuget.yml | 2 +- .../Microsoft.ReactNative.ProjectReunion.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 2c2fd2ebee8..0cddf2058cb 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true))}}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeProjectReunion, false)) }}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index 9f39c1664f5..c0081449cec 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.19041.0 + net5.0-windows10.0.17763.0 x64 From 466aef7c507517af9c408bbe4765c7f9ab14354e Mon Sep 17 00:00:00 2001 From: React-Native-Windows Bot <53619745+rnbot@users.noreply.github.com> Date: Tue, 22 Jun 2021 05:07:17 +0000 Subject: [PATCH 36/81] applying package updates ***NO_CI*** --- ...dows-63ea3a71-e181-4a1e-a183-141818f55403.json | 7 ------- ...init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json | 7 ------- .../@react-native-windows/tester/CHANGELOG.json | 15 +++++++++++++++ .../@react-native-windows/tester/CHANGELOG.md | 10 +++++++++- .../@react-native-windows/tester/package.json | 4 ++-- packages/e2e-test-app/CHANGELOG.json | 15 +++++++++++++++ packages/e2e-test-app/CHANGELOG.md | 10 +++++++++- packages/e2e-test-app/package.json | 6 +++--- packages/integration-test-app/CHANGELOG.json | 15 +++++++++++++++ packages/integration-test-app/CHANGELOG.md | 10 +++++++++- packages/integration-test-app/package.json | 4 ++-- .../jest-environment-winappdriver/CHANGELOG.json | 15 +++++++++++++++ .../jest-environment-winappdriver/CHANGELOG.md | 10 +++++++++- .../jest-environment-winappdriver/package.json | 4 ++-- packages/node-rnw-rpc/CHANGELOG.json | 15 +++++++++++++++ packages/node-rnw-rpc/CHANGELOG.md | 10 +++++++++- packages/node-rnw-rpc/package.json | 6 +++--- packages/playground/CHANGELOG.json | 15 +++++++++++++++ packages/playground/CHANGELOG.md | 10 +++++++++- packages/playground/package.json | 2 +- packages/react-native-windows-init/CHANGELOG.json | 15 +++++++++++++++ packages/react-native-windows-init/CHANGELOG.md | 10 +++++++++- packages/react-native-windows-init/package.json | 2 +- packages/sample-apps/CHANGELOG.json | 15 +++++++++++++++ packages/sample-apps/CHANGELOG.md | 10 +++++++++- packages/sample-apps/package.json | 2 +- vnext/CHANGELOG.json | 15 +++++++++++++++ vnext/CHANGELOG.md | 10 +++++++++- vnext/package.json | 2 +- 29 files changed, 232 insertions(+), 39 deletions(-) delete mode 100644 change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json delete mode 100644 change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json diff --git a/change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json b/change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json deleted file mode 100644 index 0f7aa03d6b8..00000000000 --- a/change/react-native-windows-63ea3a71-e181-4a1e-a183-141818f55403.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "prerelease", - "comment": "Have script store return nullptr on facebook::jsi::JSINativeException", - "packageName": "react-native-windows", - "email": "julio.rocha@microsoft.com", - "dependentChangeType": "patch" -} diff --git a/change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json b/change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json deleted file mode 100644 index 2f3b3602fe4..00000000000 --- a/change/react-native-windows-init-9d0bb145-b388-4dbb-a904-d1723ccf6382.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "patch", - "comment": "Hermes cannot currently be used in C# apps, so blocking it in the CLI", - "packageName": "react-native-windows-init", - "email": "asklar@microsoft.com", - "dependentChangeType": "patch" -} diff --git a/packages/@react-native-windows/tester/CHANGELOG.json b/packages/@react-native-windows/tester/CHANGELOG.json index f03b38fc7a9..8a77f9836b2 100644 --- a/packages/@react-native-windows/tester/CHANGELOG.json +++ b/packages/@react-native-windows/tester/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "@react-native-windows/tester", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "@react-native-windows/tester_v0.0.1", + "version": "0.0.1", + "comments": { + "prerelease": [ + { + "comment": "Bump react-native-windows to v0.0.0-canary.328", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "@react-native-windows/tester" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "@react-native-windows/tester_v0.0.1", diff --git a/packages/@react-native-windows/tester/CHANGELOG.md b/packages/@react-native-windows/tester/CHANGELOG.md index 120daaf8c60..df6f164055c 100644 --- a/packages/@react-native-windows/tester/CHANGELOG.md +++ b/packages/@react-native-windows/tester/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log - @react-native-windows/tester -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. ## 0.0.1 +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump react-native-windows to v0.0.0-canary.328 (julio.rocha@microsoft.com) + +## 0.0.1 + Fri, 18 Jun 2021 05:06:48 GMT ### Changes diff --git a/packages/@react-native-windows/tester/package.json b/packages/@react-native-windows/tester/package.json index f38c903ab3e..80cd4d43492 100644 --- a/packages/@react-native-windows/tester/package.json +++ b/packages/@react-native-windows/tester/package.json @@ -16,7 +16,7 @@ "peerDependencies": { "react": "17.0.2", "react-native": "0.0.0-0d32aef3a", - "react-native-windows": "^0.0.0-canary.327" + "react-native-windows": "^0.0.0-canary.328" }, "devDependencies": { "@rnw-scripts/eslint-config": "1.1.7", @@ -27,7 +27,7 @@ "just-scripts": "^1.3.3", "react-native": "0.0.0-0d32aef3a", "react-native-platform-override": "^1.4.17", - "react-native-windows": "^0.0.0-canary.327", + "react-native-windows": "^0.0.0-canary.328", "typescript": "^3.8.3" } } diff --git a/packages/e2e-test-app/CHANGELOG.json b/packages/e2e-test-app/CHANGELOG.json index 5a3d5497e9f..74f58de681b 100644 --- a/packages/e2e-test-app/CHANGELOG.json +++ b/packages/e2e-test-app/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "e2e-test-app", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "e2e-test-app_v0.0.0", + "version": "0.0.0", + "comments": { + "prerelease": [ + { + "comment": "Bump react-native-windows to v0.0.0-canary.328", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "e2e-test-app" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "e2e-test-app_v0.0.0", diff --git a/packages/e2e-test-app/CHANGELOG.md b/packages/e2e-test-app/CHANGELOG.md index cd07dc97e5d..9f059c334f6 100644 --- a/packages/e2e-test-app/CHANGELOG.md +++ b/packages/e2e-test-app/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log - e2e-test-app -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. ## 0.0.0 +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump react-native-windows to v0.0.0-canary.328 (julio.rocha@microsoft.com) + +## 0.0.0 + Fri, 18 Jun 2021 05:06:48 GMT ### Changes diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json index d4aa3d1e9ff..6630063e041 100644 --- a/packages/e2e-test-app/package.json +++ b/packages/e2e-test-app/package.json @@ -12,10 +12,10 @@ }, "dependencies": { "@react-native-windows/tester": "0.0.1", - "node-rnw-rpc": "^1.0.11-4", + "node-rnw-rpc": "^1.0.11-5", "react": "17.0.2", "react-native": "0.0.0-0d32aef3a", - "react-native-windows": "^0.0.0-canary.327" + "react-native-windows": "^0.0.0-canary.328" }, "devDependencies": { "@babel/core": "^7.14.0", @@ -33,7 +33,7 @@ "babel-jest": "^26.3.0", "eslint": "7.12.0", "jest": "^26.6.3", - "jest-environment-winappdriver": "^2.0.1-0", + "jest-environment-winappdriver": "^2.0.1-1", "just-scripts": "^1.3.3", "metro-config": "^0.66.0", "metro-react-native-babel-preset": "^0.56.0", diff --git a/packages/integration-test-app/CHANGELOG.json b/packages/integration-test-app/CHANGELOG.json index 346532dee46..926e9e5e39b 100644 --- a/packages/integration-test-app/CHANGELOG.json +++ b/packages/integration-test-app/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "integration-test-app", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "integration-test-app_v0.0.0", + "version": "0.0.0", + "comments": { + "prerelease": [ + { + "comment": "Bump react-native-windows to v0.0.0-canary.328", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "integration-test-app" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "integration-test-app_v0.0.0", diff --git a/packages/integration-test-app/CHANGELOG.md b/packages/integration-test-app/CHANGELOG.md index 291c2e6ef96..c0557d4cb3e 100644 --- a/packages/integration-test-app/CHANGELOG.md +++ b/packages/integration-test-app/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log - integration-test-app -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. ## 0.0.0 +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump react-native-windows to v0.0.0-canary.328 (julio.rocha@microsoft.com) + +## 0.0.0 + Fri, 18 Jun 2021 05:06:48 GMT ### Changes diff --git a/packages/integration-test-app/package.json b/packages/integration-test-app/package.json index f99dec5d64e..aa4fd498f6e 100644 --- a/packages/integration-test-app/package.json +++ b/packages/integration-test-app/package.json @@ -11,10 +11,10 @@ }, "dependencies": { "chai": "^4.2.0", - "node-rnw-rpc": "^1.0.11-4", + "node-rnw-rpc": "^1.0.11-5", "react": "17.0.2", "react-native": "0.0.0-0d32aef3a", - "react-native-windows": "^0.0.0-canary.327" + "react-native-windows": "^0.0.0-canary.328" }, "devDependencies": { "@babel/core": "^7.14.0", diff --git a/packages/jest-environment-winappdriver/CHANGELOG.json b/packages/jest-environment-winappdriver/CHANGELOG.json index 76cc8d66dea..5f8e4b7ca80 100644 --- a/packages/jest-environment-winappdriver/CHANGELOG.json +++ b/packages/jest-environment-winappdriver/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "jest-environment-winappdriver", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "jest-environment-winappdriver_v2.0.1-1", + "version": "2.0.1-1", + "comments": { + "prerelease": [ + { + "comment": "Bump node-rnw-rpc to v1.0.11-5", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "jest-environment-winappdriver" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "jest-environment-winappdriver_v2.0.1-0", diff --git a/packages/jest-environment-winappdriver/CHANGELOG.md b/packages/jest-environment-winappdriver/CHANGELOG.md index ebc440374fb..71c026a04e4 100644 --- a/packages/jest-environment-winappdriver/CHANGELOG.md +++ b/packages/jest-environment-winappdriver/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - jest-environment-winappdriver -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. +## 2.0.1-1 + +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump node-rnw-rpc to v1.0.11-5 (julio.rocha@microsoft.com) + ## 2.0.1-0 Fri, 18 Jun 2021 05:06:48 GMT diff --git a/packages/jest-environment-winappdriver/package.json b/packages/jest-environment-winappdriver/package.json index fbc4df3c1d6..48f9988896a 100644 --- a/packages/jest-environment-winappdriver/package.json +++ b/packages/jest-environment-winappdriver/package.json @@ -1,6 +1,6 @@ { "name": "jest-environment-winappdriver", - "version": "2.0.1-0", + "version": "2.0.1-1", "description": "A Jest Environment for WinAppDriver + WebDriverIO", "main": "lib-commonjs/WinAppDriverEnvironment.js", "repository": "https://github.com/microsoft/react-native-windows", @@ -14,7 +14,7 @@ "watch": "rnw-scripts watch" }, "dependencies": { - "node-rnw-rpc": "^1.0.11-4", + "node-rnw-rpc": "^1.0.11-5", "webdriverio": "^6.9.0" }, "devDependencies": { diff --git a/packages/node-rnw-rpc/CHANGELOG.json b/packages/node-rnw-rpc/CHANGELOG.json index 270ae840e07..fedf9efdb6d 100644 --- a/packages/node-rnw-rpc/CHANGELOG.json +++ b/packages/node-rnw-rpc/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "node-rnw-rpc", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "node-rnw-rpc_v1.0.11-5", + "version": "1.0.11-5", + "comments": { + "prerelease": [ + { + "comment": "Bump react-native-windows to v0.0.0-canary.328", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "node-rnw-rpc" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "node-rnw-rpc_v1.0.11-4", diff --git a/packages/node-rnw-rpc/CHANGELOG.md b/packages/node-rnw-rpc/CHANGELOG.md index f8b60ebd607..ea5757a53f8 100644 --- a/packages/node-rnw-rpc/CHANGELOG.md +++ b/packages/node-rnw-rpc/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - node-rnw-rpc -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. +## 1.0.11-5 + +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump react-native-windows to v0.0.0-canary.328 (julio.rocha@microsoft.com) + ## 1.0.11-4 Fri, 18 Jun 2021 05:06:48 GMT diff --git a/packages/node-rnw-rpc/package.json b/packages/node-rnw-rpc/package.json index 217b9240391..f442338005e 100644 --- a/packages/node-rnw-rpc/package.json +++ b/packages/node-rnw-rpc/package.json @@ -1,6 +1,6 @@ { "name": "node-rnw-rpc", - "version": "1.0.11-4", + "version": "1.0.11-5", "license": "MIT", "scripts": { "build": "rnw-scripts build", @@ -15,7 +15,7 @@ "jsonrpc-lite": "^2.2.0" }, "peerDependencies": { - "react-native-windows": ">=0.0.0-canary.327 <0.0.0" + "react-native-windows": ">=0.0.0-canary.328 <0.0.0" }, "devDependencies": { "@rnw-scripts/eslint-config": "1.1.7", @@ -28,7 +28,7 @@ "prettier": "1.19.1", "react": "17.0.2", "react-native": "0.0.0-0d32aef3a", - "react-native-windows": "^0.0.0-canary.327", + "react-native-windows": "^0.0.0-canary.328", "typescript": "^3.8.3" }, "files": [ diff --git a/packages/playground/CHANGELOG.json b/packages/playground/CHANGELOG.json index aaad65d471d..d36e7ad2596 100644 --- a/packages/playground/CHANGELOG.json +++ b/packages/playground/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "playground", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "playground_v0.0.54", + "version": "0.0.54", + "comments": { + "prerelease": [ + { + "comment": "Bump react-native-windows to v0.0.0-canary.328", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "playground" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "playground_v0.0.54", diff --git a/packages/playground/CHANGELOG.md b/packages/playground/CHANGELOG.md index 3feb4534707..02397ecbba1 100644 --- a/packages/playground/CHANGELOG.md +++ b/packages/playground/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log - playground -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. ## 0.0.54 +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump react-native-windows to v0.0.0-canary.328 (julio.rocha@microsoft.com) + +## 0.0.54 + Fri, 18 Jun 2021 05:06:48 GMT ### Changes diff --git a/packages/playground/package.json b/packages/playground/package.json index b74dc07d64b..c98595e749b 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -13,7 +13,7 @@ "@react-native-windows/tester": "0.0.1", "react": "17.0.2", "react-native": "0.0.0-0d32aef3a", - "react-native-windows": "0.0.0-canary.327" + "react-native-windows": "0.0.0-canary.328" }, "devDependencies": { "@babel/core": "^7.14.0", diff --git a/packages/react-native-windows-init/CHANGELOG.json b/packages/react-native-windows-init/CHANGELOG.json index 8c5a9596358..f828a079e2e 100644 --- a/packages/react-native-windows-init/CHANGELOG.json +++ b/packages/react-native-windows-init/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "react-native-windows-init", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "react-native-windows-init_v1.1.59", + "version": "1.1.59", + "comments": { + "patch": [ + { + "comment": "Hermes cannot currently be used in C# apps, so blocking it in the CLI", + "author": "asklar@microsoft.com", + "commit": "cbd81f3c1d41be5066e576e3217034d386375321", + "package": "react-native-windows-init" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "react-native-windows-init_v1.1.58", diff --git a/packages/react-native-windows-init/CHANGELOG.md b/packages/react-native-windows-init/CHANGELOG.md index 93ac4a9b491..fb1d421e877 100644 --- a/packages/react-native-windows-init/CHANGELOG.md +++ b/packages/react-native-windows-init/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - react-native-windows-init -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. +## 1.1.59 + +Tue, 22 Jun 2021 05:07:16 GMT + +### Patches + +- Hermes cannot currently be used in C# apps, so blocking it in the CLI (asklar@microsoft.com) + ## 1.1.58 Fri, 18 Jun 2021 05:06:48 GMT diff --git a/packages/react-native-windows-init/package.json b/packages/react-native-windows-init/package.json index f920360641c..843fe4ec008 100644 --- a/packages/react-native-windows-init/package.json +++ b/packages/react-native-windows-init/package.json @@ -1,6 +1,6 @@ { "name": "react-native-windows-init", - "version": "1.1.58", + "version": "1.1.59", "description": "CLI to add react-native-windows to an existing react-native project", "main": "index.js", "repository": "https://github.com/microsoft/react-native-windows", diff --git a/packages/sample-apps/CHANGELOG.json b/packages/sample-apps/CHANGELOG.json index c0ed07f52cb..c8501493ffc 100644 --- a/packages/sample-apps/CHANGELOG.json +++ b/packages/sample-apps/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "sample-apps", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "sample-apps_v0.0.0", + "version": "0.0.0", + "comments": { + "prerelease": [ + { + "comment": "Bump react-native-windows to v0.0.0-canary.328", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "sample-apps" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "sample-apps_v0.0.0", diff --git a/packages/sample-apps/CHANGELOG.md b/packages/sample-apps/CHANGELOG.md index 77293f94938..6e3eba04b03 100644 --- a/packages/sample-apps/CHANGELOG.md +++ b/packages/sample-apps/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log - sample-apps -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. ## 0.0.0 +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Bump react-native-windows to v0.0.0-canary.328 (julio.rocha@microsoft.com) + +## 0.0.0 + Fri, 18 Jun 2021 05:06:48 GMT ### Changes diff --git a/packages/sample-apps/package.json b/packages/sample-apps/package.json index 02f57df4202..56229b2a7f8 100644 --- a/packages/sample-apps/package.json +++ b/packages/sample-apps/package.json @@ -13,7 +13,7 @@ "dependencies": { "react": "17.0.2", "react-native": "0.0.0-0d32aef3a", - "react-native-windows": "0.0.0-canary.327" + "react-native-windows": "0.0.0-canary.328" }, "devDependencies": { "@babel/core": "^7.14.0", diff --git a/vnext/CHANGELOG.json b/vnext/CHANGELOG.json index 211366ae25e..8e92ad86de0 100644 --- a/vnext/CHANGELOG.json +++ b/vnext/CHANGELOG.json @@ -1,6 +1,21 @@ { "name": "react-native-windows", "entries": [ + { + "date": "Tue, 22 Jun 2021 05:07:16 GMT", + "tag": "react-native-windows_v0.0.0-canary.328", + "version": "0.0.0-canary.328", + "comments": { + "prerelease": [ + { + "comment": "Have script store return nullptr on facebook::jsi::JSINativeException", + "author": "julio.rocha@microsoft.com", + "commit": "46cbceb816e78fa345be3c633328ea0829ee604b", + "package": "react-native-windows" + } + ] + } + }, { "date": "Fri, 18 Jun 2021 05:06:48 GMT", "tag": "react-native-windows_v0.0.0-canary.327", diff --git a/vnext/CHANGELOG.md b/vnext/CHANGELOG.md index e331a8b71fc..f05a4b71369 100644 --- a/vnext/CHANGELOG.md +++ b/vnext/CHANGELOG.md @@ -1,9 +1,17 @@ # Change Log - react-native-windows -This log was last generated on Fri, 18 Jun 2021 05:06:48 GMT and should not be manually modified. +This log was last generated on Tue, 22 Jun 2021 05:07:16 GMT and should not be manually modified. +## 0.0.0-canary.328 + +Tue, 22 Jun 2021 05:07:16 GMT + +### Changes + +- Have script store return nullptr on facebook::jsi::JSINativeException (julio.rocha@microsoft.com) + ## 0.0.0-canary.327 Fri, 18 Jun 2021 05:06:48 GMT diff --git a/vnext/package.json b/vnext/package.json index aa2b29f6d39..e620f6a1769 100644 --- a/vnext/package.json +++ b/vnext/package.json @@ -1,6 +1,6 @@ { "name": "react-native-windows", - "version": "0.0.0-canary.327", + "version": "0.0.0-canary.328", "license": "MIT", "repository": { "type": "git", From 2783cfa3a8632b5c5e66ddd62e80a9195d7a3147 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 22:32:38 -0700 Subject: [PATCH 37/81] 18362 --- .../Microsoft.ReactNative.ProjectReunion.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index c0081449cec..7c8deade144 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.17763.0 + net5.0-windows10.0.18362.0 x64 From af3a3f728958eac56b90bd02fd4c2eaad1507309 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 22 Jun 2021 00:42:41 -0700 Subject: [PATCH 38/81] 19041 --- .../Microsoft.ReactNative.ProjectReunion.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index 7c8deade144..39114716000 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.18362.0 + net5.0-windows10.0.19041.0 x64 @@ -8,7 +8,7 @@ Microsoft.ReactNative $(OutDir) - + @@ -32,9 +32,9 @@ + SourceFiles="..\build\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion\bin\Microsoft.ReactNative.ProjectReunion.dll" + DestinationFolder="..\target\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion" + SkipUnchangedFiles="true" /> From 566ee7be0e82e86210956c1c7c63b869680d9066 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 22 Jun 2021 01:40:11 -0700 Subject: [PATCH 39/81] >> --- .../Microsoft.ReactNative.ProjectReunion.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index 39114716000..82b28146eaa 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -32,9 +32,9 @@ + SourceFiles="..\build\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion\bin\Microsoft.ReactNative.ProjectReunion.dll" + DestinationFolder="..\target\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion" + SkipUnchangedFiles="true" /> From 1bd2d24b7ff4ecd6191622028d0f3d6b14bbdae9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 01:43:40 -0700 Subject: [PATCH 40/81] =?UTF-8?q?=F0=9F=93=A6=20Bump=20@babel/preset-env?= =?UTF-8?q?=20from=207.14.5=20to=207.14.7=20(#8083)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.5 to 7.14.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.7/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 78 +++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/yarn.lock b/yarn.lock index ccaf9c02132..4aa831a59c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -114,10 +114,10 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" - integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" + integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.14.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5": version "7.14.6" @@ -385,10 +385,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" -"@babel/plugin-proposal-async-generator-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.5.tgz#4024990e3dd74181f4f426ea657769ff49a2df39" - integrity sha512-tbD/CG3l43FIXxmu4a7RBe4zH7MLJ+S/lFowPFO7HetS2hyOZ/0nnnznegDuzFzfkyQYTxqdTH/hKmuBngaDAA== +"@babel/plugin-proposal-async-generator-functions@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" + integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-remap-async-to-generator" "^7.14.5" @@ -467,12 +467,12 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.5.tgz#e581d5ccdfa187ea6ed73f56c6a21c1580b90fbf" - integrity sha512-VzMyY6PWNPPT3pxc5hi9LloKNr4SSrVCg7Yr6aZpW4Ym07r7KqSU/QXYwjXLVxqwSv0t/XSXkFoKBPUkZ8vb2A== +"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363" + integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g== dependencies: - "@babel/compat-data" "^7.14.5" + "@babel/compat-data" "^7.14.7" "@babel/helper-compilation-targets" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" @@ -711,10 +711,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.5.tgz#d32ad19ff1a6da1e861dc62720d80d9776e3bf35" - integrity sha512-wU9tYisEbRMxqDezKUqC9GleLycCRoUsai9ddlsq54r8QRLaeEhc+d+9DqCG+kV9W2GgQjTZESPTpn5bAFMDww== +"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576" + integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -816,10 +816,10 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.5.tgz#d537e8ee083ee6f6aa4f4eef9d2081d555746e4c" - integrity sha512-+Xe5+6MWFo311U8SchgeX5c1+lJM+eZDBZgD+tvXu9VVQPXwwVzeManMMjYX6xw2HczngfOSZjoFYKwdeB/Jvw== +"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" + integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -922,10 +922,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.5.tgz#bd269fb4119754d2ce7f4cc39a96b4f71baae356" - integrity sha512-/3iqoQdiWergnShZYl0xACb4ADeYCJ7X/RgmwtXshn6cIvautRPAFzhd58frQlokLO6Jb4/3JXvmm6WNTPtiTw== +"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.14.6": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144" + integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" @@ -976,16 +976,16 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@^7.1.6", "@babel/preset-env@^7.11.5", "@babel/preset-env@^7.8.4": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.5.tgz#c0c84e763661fd0e74292c3d511cb33b0c668997" - integrity sha512-ci6TsS0bjrdPpWGnQ+m4f+JSSzDKlckqKIJJt9UZ/+g7Zz9k0N8lYU8IeLg/01o2h8LyNZDMLGgRLDTxpudLsA== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.7.tgz#5c70b22d4c2d893b03d8c886a5c17422502b932a" + integrity sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA== dependencies: - "@babel/compat-data" "^7.14.5" + "@babel/compat-data" "^7.14.7" "@babel/helper-compilation-targets" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.5" + "@babel/plugin-proposal-async-generator-functions" "^7.14.7" "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import" "^7.14.5" @@ -994,7 +994,7 @@ "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" "@babel/plugin-proposal-numeric-separator" "^7.14.5" - "@babel/plugin-proposal-object-rest-spread" "^7.14.5" + "@babel/plugin-proposal-object-rest-spread" "^7.14.7" "@babel/plugin-proposal-optional-catch-binding" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" "@babel/plugin-proposal-private-methods" "^7.14.5" @@ -1020,7 +1020,7 @@ "@babel/plugin-transform-block-scoping" "^7.14.5" "@babel/plugin-transform-classes" "^7.14.5" "@babel/plugin-transform-computed-properties" "^7.14.5" - "@babel/plugin-transform-destructuring" "^7.14.5" + "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" "@babel/plugin-transform-duplicate-keys" "^7.14.5" "@babel/plugin-transform-exponentiation-operator" "^7.14.5" @@ -1032,7 +1032,7 @@ "@babel/plugin-transform-modules-commonjs" "^7.14.5" "@babel/plugin-transform-modules-systemjs" "^7.14.5" "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" "@babel/plugin-transform-parameters" "^7.14.5" @@ -1040,7 +1040,7 @@ "@babel/plugin-transform-regenerator" "^7.14.5" "@babel/plugin-transform-reserved-words" "^7.14.5" "@babel/plugin-transform-shorthand-properties" "^7.14.5" - "@babel/plugin-transform-spread" "^7.14.5" + "@babel/plugin-transform-spread" "^7.14.6" "@babel/plugin-transform-sticky-regex" "^7.14.5" "@babel/plugin-transform-template-literals" "^7.14.5" "@babel/plugin-transform-typeof-symbol" "^7.14.5" @@ -1051,7 +1051,7 @@ babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.14.0" + core-js-compat "^3.15.0" semver "^6.3.0" "@babel/preset-flow@^7.0.0": @@ -4031,10 +4031,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.14.0, core-js-compat@^3.9.1: - version "3.14.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.14.0.tgz#b574dabf29184681d5b16357bd33d104df3d29a5" - integrity sha512-R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A== +core-js-compat@^3.15.0, core-js-compat@^3.9.1: + version "3.15.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.0.tgz#e14a371123db9d1c5b41206d3f420643d238b8fa" + integrity sha512-8X6lWsG+s7IfOKzV93a7fRYfWRZobOfjw5V5rrq43Vh/W+V6qYxl7Akalsvgab4PFT/4L/pjQbdBUEM36NXKrw== dependencies: browserslist "^4.16.6" semver "7.0.0" From 2c8f6ba93a68883acd3f545da01ea73171aa8425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 01:43:55 -0700 Subject: [PATCH 41/81] =?UTF-8?q?=F0=9F=93=A6=20Bump=20@babel/parser=20fro?= =?UTF-8?q?m=207.14.6=20to=207.14.7=20(#8082)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@babel/parser](https://github.com/babel/babel/tree/HEAD/packages/babel-parser) from 7.14.6 to 7.14.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.7/packages/babel-parser) --- updated-dependencies: - dependency-name: "@babel/parser" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4aa831a59c8..e667ae650a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -372,9 +372,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.11.5", "@babel/parser@^7.12.0", "@babel/parser@^7.12.5", "@babel/parser@^7.13.9", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.0": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" - integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" + integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" From a36b770453c33209def5e77569076fb52001c20e Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Tue, 22 Jun 2021 02:04:38 -0700 Subject: [PATCH 42/81] Tie visitAllPages Test to RNTesterList (#8071) * Tie visitAllPages Test to RNTesterList Fixes #7726 We have a UIA-based test which navigates back and forward from each RNTester example. The list of examples cannot be populated by the UI, and is currently hardcoded. The source of truth, RNTesterList in RNTester, loads quite a bit of RN with it. A previously discussed approach was to relay loaded data from the RN application process to the test runner. This change goes with a simpler approach, of making the test runner act more like RN. That includes Metro's Babel transformations, Windows platform resolution logic, and global setup. We can mostly rely on existing react-native UT infrastructure to automate most of this. This loads enough of the environment to allow successfully loading all RNTester example modules, letting us poke at its data. * remove extraneous export * Reduce synced typings surface --- packages/e2e-test-app/jest-resolver.js | 18 +++++ packages/e2e-test-app/jest.config.js | 19 ++++- packages/e2e-test-app/jest.setup.js | 3 + packages/e2e-test-app/package.json | 1 + .../e2e-test-app/test/framework/Navigation.ts | 6 +- .../e2e-test-app/test/visitAllPages.test.ts | 81 +++++-------------- 6 files changed, 63 insertions(+), 65 deletions(-) create mode 100644 packages/e2e-test-app/jest-resolver.js diff --git a/packages/e2e-test-app/jest-resolver.js b/packages/e2e-test-app/jest-resolver.js new file mode 100644 index 00000000000..84263bd245a --- /dev/null +++ b/packages/e2e-test-app/jest-resolver.js @@ -0,0 +1,18 @@ +const path = require('path'); +const resolveSync = require('resolve').sync; + +module.exports = (request, options) => { + return resolveSync(request, { + ...options, + preserveSymlinks: false, + pathFilter: (pkg, _path, relativePath) => { + if (pkg.name === 'react-native') { + const basePath = path.dirname(require.resolve(`${pkg.name}/package.json`)); + const rnwPath = path.dirname(require.resolve('react-native-windows/package.json')); + return path.relative(basePath, path.join(rnwPath, relativePath)); + } else { + return relativePath; + } + } + }); +} diff --git a/packages/e2e-test-app/jest.config.js b/packages/e2e-test-app/jest.config.js index 1959c0ed9f9..99da71e8e2d 100644 --- a/packages/e2e-test-app/jest.config.js +++ b/packages/e2e-test-app/jest.config.js @@ -22,11 +22,26 @@ module.exports = { // Default timeout of a test in milliseconds testTimeout: 70000, + // This option allows the use of a custom resolver + resolver: './jest-resolver.js', + + // This will be used to configure the behavior of jest-haste-map, Jest's internal file crawler/cache system + haste: { + defaultPlatform: 'windows', + platforms: ['windows'], + }, + // A map from regular expressions to paths to transformers transform: { - '^.+\\.[jt]sx?$': ['babel-jest', require('@rnw-scripts/babel-node-config')], + '^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$': + 'react-native-windows/jest/assetFileTransformer.js', + '.*': 'react-native-windows/jest/preprocessor.js', }, + // An array of regexp pattern strings that are matched against all source file paths before transformation. + // If the file path matches any of the patterns, it will not be transformed. + transformIgnorePatterns: [], + // Specifies the maximum number of workers the worker-pool will spawn for running tests. maxWorkers: 1, @@ -35,7 +50,7 @@ module.exports = { // A list of paths to modules that run some code to configure or set up the testing framework // before each test file in the suite is executed - setupFilesAfterEnv: ['./jest.setup.js'], + setupFilesAfterEnv: ['react-native-windows/jest/setup', './jest.setup.js'], testEnvironmentOptions: { app: 'ReactUWPTestApp_8wekyb3d8bbwe!App', diff --git a/packages/e2e-test-app/jest.setup.js b/packages/e2e-test-app/jest.setup.js index f08214d2acf..b50620bad2a 100644 --- a/packages/e2e-test-app/jest.setup.js +++ b/packages/e2e-test-app/jest.setup.js @@ -9,6 +9,7 @@ const fs = require('fs'); const path = require('path'); const sanitizeFilename = require('sanitize-filename'); +const {LogBox} = require('react-native'); const screenshotDir = './errorShots'; fs.mkdirSync(screenshotDir, {recursive: true}); @@ -26,3 +27,5 @@ global.jasmine.getEnv().addReporter({ } }, }); + +LogBox.ignoreAllLogs(true); diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json index 6630063e041..6b4da4e6865 100644 --- a/packages/e2e-test-app/package.json +++ b/packages/e2e-test-app/package.json @@ -39,6 +39,7 @@ "metro-react-native-babel-preset": "^0.56.0", "prettier": "1.19.1", "react-test-renderer": "17.0.2", + "resolve": "^1.14.2", "sanitize-filename": "^1.6.3", "typescript": "^3.8.3" } diff --git a/packages/e2e-test-app/test/framework/Navigation.ts b/packages/e2e-test-app/test/framework/Navigation.ts index 02598fbf929..81dd35505cb 100644 --- a/packages/e2e-test-app/test/framework/Navigation.ts +++ b/packages/e2e-test-app/test/framework/Navigation.ts @@ -26,7 +26,7 @@ export async function goToApiExample(example: string) { async function goToExample(example: string) { // Filter the list down to the one test, to improve the stability of selectors const searchBox = await $('~explorer_search'); - await searchBox.setValue(example); + await searchBox.setValue(regexEscape(example)); const exampleButton = await $(`~${example}`); await exampleButton.click(); @@ -38,3 +38,7 @@ async function goToExample(example: string) { const componentsTab = await $('~components-tab'); expect(await componentsTab.isDisplayed()).toBe(true); } + +function regexEscape(str: string): string { + return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); +} diff --git a/packages/e2e-test-app/test/visitAllPages.test.ts b/packages/e2e-test-app/test/visitAllPages.test.ts index 926ef5c552c..01dbba6698c 100644 --- a/packages/e2e-test-app/test/visitAllPages.test.ts +++ b/packages/e2e-test-app/test/visitAllPages.test.ts @@ -7,70 +7,27 @@ import {goToComponentExample, goToApiExample} from './framework'; -describe('visitAllPages', () => { - const componentExamples = [ - 'ActivityIndicator', - 'Button', - 'DatePicker', - 'Fast Path Texts', - 'FlatList', - 'FlatList with Separators', - 'FlatList onViewableItemsChanged', - 'FlatList onEndReached', - 'Flyout', - 'Glyph UWP', - 'Image', - // 'FlatList - MultiColumn', - 'New App Screen', - 'PickerWindows', - 'Pressable', - 'Popup', - 'ScrollViewSimpleExample', - // 'SectionList', - 'Switch', - 'Text', - 'TextInput', - //'Touchable* and onPress', - 'TransferProperties', - 'TransparentHitTestExample', - 'View', - // 'LegacyControlStyleTest', - // 'LegacyTextInputTest', - // 'LegacyLoginTest', - // 'LegacyImageTest', - ]; +type RNTesterExampleModule = { + title: string; + description: string; +}; + +type RNTesterExample = { + key: string; + module: RNTesterExampleModule; +}; + +type RNTesterList = { + APIExamples: RNTesterExample[]; + ComponentExamples: RNTesterExample[]; +}; - const apiExamples = [ - 'Keyboard Focus Example', - 'Accessibility', - 'AccessibilityInfo', - 'Accessibility Windows', - 'AsyncStorage Windows', - 'Alerts', - 'Animated - Examples', - 'Animated - Gratuitous App', - 'Appearance', - 'AppState', - 'Border', - 'Crash', - 'DevSettings', - 'Dimensions', - 'Keyboard', - 'Layout Events', - 'Linking', - 'Layout - Flexbox', - 'Mouse Events', - 'Native Animated Example', - 'PanResponder Sample', - 'PlatformColor', - 'Pointer Events', - 'RTLExample', - 'Share', - 'Timers', - 'WebSocket', - 'Transforms', - ]; +const testerList: RNTesterList = require('@react-native-windows/tester/js/utils/RNTesterList'); +const apiExamples = testerList.APIExamples.map(e => e.module.title); +const componentExamples = testerList.ComponentExamples.map(e => e.module.title); + +describe('visitAllPages', () => { for (const component of componentExamples) { test(component, async () => await goToComponentExample(component)); } From 5ef79b5a6d92eab911e611b81f32b97f5316ecef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 05:49:38 -0700 Subject: [PATCH 43/81] =?UTF-8?q?=F0=9F=93=A6=20Bump=20@babel/traverse=20f?= =?UTF-8?q?rom=207.14.5=20to=207.14.7=20(#8081)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.14.5 to 7.14.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.14.7/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index e667ae650a7..9fb0f62a8c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -371,7 +371,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.11.5", "@babel/parser@^7.12.0", "@babel/parser@^7.12.5", "@babel/parser@^7.13.9", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.0": +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.11.5", "@babel/parser@^7.12.0", "@babel/parser@^7.12.5", "@babel/parser@^7.13.9", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.7.0": version "7.14.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== @@ -1111,16 +1111,16 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.5", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" - integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" + integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== dependencies: "@babel/code-frame" "^7.14.5" "@babel/generator" "^7.14.5" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.5" + "@babel/parser" "^7.14.7" "@babel/types" "^7.14.5" debug "^4.1.0" globals "^11.1.0" From db595cc96b79257f5ff88bae07ce209c6eda301d Mon Sep 17 00:00:00 2001 From: dannyvv Date: Tue, 22 Jun 2021 08:27:21 -0700 Subject: [PATCH 44/81] Fix Pipeline (#8084) --- .ado/jobs/desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/desktop.yml b/.ado/jobs/desktop.yml index 0ce4cf3d38c..59ada90c923 100644 --- a/.ado/jobs/desktop.yml +++ b/.ado/jobs/desktop.yml @@ -111,7 +111,7 @@ jobs: collectDumpOn: onAbortOnly vsTestVersion: latest failOnMinTestsNotRun: true - condition: and(succeeded(), not(eq(variables['BuildPlatform'], 'arm64'))) + condition: and(succeeded(), not(eq(variables['BuildPlatform'], 'ARM64'))) - task: PowerShell@2 displayName: Set up test servers @@ -144,7 +144,7 @@ jobs: failOnMinTestsNotRun: true otherConsoleOptions: '/blame -- RunConfiguration.TestSessionTimeout=300000' # Suspected debug assert in TestRunner hanging tests randomly. Run only on Release for now. - condition: and(succeeded(), ne(variables['BuildConfiguration'], 'Debug')) + condition: and(succeeded(), ne(variables['BuildConfiguration'], 'Debug'), not(eq(variables['BuildPlatform'], 'ARM64'))) - template: ../templates/stop-packagers.yml From 9ca44748e2b0a8732a5e8e4ebdd65a63f278a423 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 22 Jun 2021 11:18:51 -0700 Subject: [PATCH 45/81] Copy nuspec --- .ado/jobs/project-reunion.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 42a0039034d..644f79000d3 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -39,6 +39,13 @@ jobs: buildConfiguration: $(BuildConfiguration) msbuildArguments: /p:UseWinUI3=true + - task: CopyFiles@2 + displayName: Copy NuGet artifacts + inputs: + sourceFolder: $(Build.SourcesDirectory)\vnext\scripts + targetFolder: $(Build.StagingDirectory) + contents: Microsoft.ReactNative.ProjectReunion.nuspec + - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: From af0a20ecd52c6aaf6399baae436f60aa9c097e06 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 17 Jun 2021 15:58:47 -0700 Subject: [PATCH 46/81] Create cswinrt projection nuget project --- vnext/ExperimentalFeatures.props | 5 + .../Microsoft.ProjectReunion.ReactNative.sln | 148 ++++++++++++++++++ .../Directory.Build.props | 8 + ...icrosoft.ProjectReunion.ReactNative.csproj | 34 ++++ .../Microsoft.ReactNative.Interop.nuspec | 25 +++ 5 files changed, 220 insertions(+) create mode 100644 vnext/ExperimentalFeatures.props create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative.sln create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj create mode 100644 vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props new file mode 100644 index 00000000000..2d53f5087bc --- /dev/null +++ b/vnext/ExperimentalFeatures.props @@ -0,0 +1,5 @@ + + + true + + \ No newline at end of file diff --git a/vnext/Microsoft.ProjectReunion.ReactNative.sln b/vnext/Microsoft.ProjectReunion.ReactNative.sln new file mode 100644 index 00000000000..53c7707221f --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative.sln @@ -0,0 +1,148 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31410.357 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ProjectReunion.ReactNative", "Microsoft.ProjectReunion.ReactNative\Microsoft.ProjectReunion.ReactNative.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "fmt\fmt.vcxproj", "{14B93DC8-FD93-4A6D-81CB-8BC96644501C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject +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}") = "ReactCommon", "ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.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|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|ARM64.ActiveCfg = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|ARM64.Build.0 = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x64.ActiveCfg = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x64.Build.0 = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x86.ActiveCfg = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Debug|x86.Build.0 = Debug|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|ARM64.ActiveCfg = Release|Any CPU + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|ARM64.Build.0 = Release|Any CPU + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x64.ActiveCfg = Release|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x64.Build.0 = Release|x64 + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x86.ActiveCfg = Release|Any CPU + {FB80EBB0-1E51-465D-953C-72829AE0E9EF}.Release|x86.Build.0 = Release|Any CPU + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Deploy.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Build.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Build.0 = Release|Win32 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32 + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Deploy.0 = Release|Win32 + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Deploy.0 = Release|Win32 + {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}.Debug|x86.Deploy.0 = Debug|Win32 + {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 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Deploy.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {14B93DC8-FD93-4A6D-81CB-8BC96644501C} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {9BEDB5DC-8F9F-40CD-905B-C6AD6FC95CF6} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F633EDF9-1BF7-4A0C-B5C3-53B94A024548} + EndGlobalSection +EndGlobal diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props b/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props new file mode 100644 index 00000000000..4b0f55ded87 --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props @@ -0,0 +1,8 @@ + + + $([MSBuild]::NormalizeDirectory('$(SolutionDir)build', '$(Platform)', '$(Configuration)'))\Microsoft.ProjectReunion.ReactNative + $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'bin')) + $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'obj')) + + + \ No newline at end of file diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj new file mode 100644 index 00000000000..9e22b49ae49 --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -0,0 +1,34 @@ + + + net5.0-windows10.0.19041.0 + x64 + + + + Microsoft.ReactNative + $(OutDir) + + + + + + + + + + + + + + + + + + + + ..\nuget\ + $(GeneratedNugetDir)Microsoft.ReactNative.Interop.nuspec + $(GeneratedNugetDir) + true + + diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec new file mode 100644 index 00000000000..6d8dfd76ba3 --- /dev/null +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec @@ -0,0 +1,25 @@ + + + + Microsoft.ReactNative + 0.0.1-prerelease + Microsoft + React Native for Windows + + + + + + + + + + + + + + + + + + \ No newline at end of file From 245274f63bb6f1d9207cea7a63227ded8c8dd345 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 17 Jun 2021 16:11:54 -0700 Subject: [PATCH 47/81] nuget package builds --- .../Microsoft.ProjectReunion.ReactNative.csproj | 4 ++-- ...nuspec => Microsoft.ProjectReunion.ReactNative.nuspec} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename vnext/Microsoft.ProjectReunion.ReactNative/{Microsoft.ReactNative.Interop.nuspec => Microsoft.ProjectReunion.ReactNative.nuspec} (79%) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index 9e22b49ae49..1395fa34004 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -26,8 +26,8 @@ - ..\nuget\ - $(GeneratedNugetDir)Microsoft.ReactNative.Interop.nuspec + .\nuget\ + Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) true diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec similarity index 79% rename from vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec rename to vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec index 6d8dfd76ba3..379caf1047b 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ReactNative.Interop.nuspec +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec @@ -1,7 +1,7 @@ - + - Microsoft.ReactNative + Microsoft.ProjectReunion.ReactNative 0.0.1-prerelease Microsoft React Native for Windows @@ -19,7 +19,7 @@ - + - \ No newline at end of file + From 5f37422a32309638f070192c493904f50e65b7ee Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:07:58 -0700 Subject: [PATCH 48/81] use 1.3.0 and reunion 0.8 preview --- .../Microsoft.ProjectReunion.ReactNative.csproj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index 1395fa34004..d687d225609 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -10,14 +10,13 @@ - - + - - - + + + From 867320368fd861ecfd2f13f7a7d25bee182e4415 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:30:52 -0700 Subject: [PATCH 49/81] publish artifact with reunion nupkg --- .ado/jobs/universal.yml | 17 ++++++++++++++++- .../Microsoft.ProjectReunion.ReactNative.csproj | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index efb6f0c64be..9e579e6bb28 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,7 +102,22 @@ - template: ../templates/component-governance.yml - + - template: ../templates/build-rnw.yml + parameters: + project: vnext/Microsoft.ProjectReunion.ReactNative.sln + buildPlatform: x64 + buildConfiguration: Release + multicoreBuild: true + msbuildArguments: /p:RNW_FASTBUILD=${{ matrix.FastBuild }} /p:UseWinUI3=true + displayName: Build ProjectReunion x64 Release + + - task: PublishPipelineArtifact@1 + displayName: "Publish Reunion nuget package" + inputs: + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + artifactName: "ProjectReunion-x64-Release" + + - job: UniversalTest${{ matrix.Name }} variables: - template: ../variables/vs2019.yml diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index d687d225609..a7f8272bf20 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -1,4 +1,4 @@ - + net5.0-windows10.0.19041.0 x64 @@ -25,7 +25,7 @@ - .\nuget\ + ..\target\$(Platform)\$(Configuration)\ Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) true From d44451c76e893e47abc771aa9afc7623a148dbcb Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:31:31 -0700 Subject: [PATCH 50/81] Change files --- ...ative-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json diff --git a/change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json b/change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json new file mode 100644 index 00000000000..db29e65518a --- /dev/null +++ b/change/react-native-windows-59917df8-86a0-4d7b-904b-b8a138b7d92d.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Create cswinrt projection nuget project", + "packageName": "react-native-windows", + "email": "asklar@microsoft.com", + "dependentChangeType": "patch" +} From f62565a784ade9c8fa54ad6d305dfe35ae39e02f Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 00:58:57 -0700 Subject: [PATCH 51/81] > --- .ado/jobs/universal.yml | 50 ++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 9e579e6bb28..198358f6adf 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,20 +102,44 @@ - template: ../templates/component-governance.yml - - template: ../templates/build-rnw.yml - parameters: - project: vnext/Microsoft.ProjectReunion.ReactNative.sln - buildPlatform: x64 - buildConfiguration: Release - multicoreBuild: true - msbuildArguments: /p:RNW_FASTBUILD=${{ matrix.FastBuild }} /p:UseWinUI3=true - displayName: Build ProjectReunion x64 Release + - ${{ if eq(matrix.BuildPlatform, 'x64') and eq (matrix.BuildConfiguration, 'Release') }}: + - task: VSBuild@1 + displayName: Reunion ${{parameters.project}} + inputs: + solution: vnext/Microsoft.ProjectReunion.ReactNative.sln + platform: x64 + configuration: Release + clean: false # Optional + maximumCpuCount: true # Optional + restoreNugetPackages: true # Optional + createLogFile: true + logFileVerbosity: detailed + msbuildArgs: + /p:PreferredToolArchitecture=x64 + /p:PlatformToolset=x64 + /p:BaseIntDir=$(BaseIntDir) + /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" + /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" + /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" + /p:PublishToolDuringBuild=true + /p:EnableSourceLink=true + /bl:$(BuildLogDirectory)\MsBuild.binlog + /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err + /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn + /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log + /p:RNW_FASTBUILD=true + /p:UseWinUI3=true - - task: PublishPipelineArtifact@1 - displayName: "Publish Reunion nuget package" - inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg - artifactName: "ProjectReunion-x64-Release" + - template: upload-build-logs.yml + parameters: + buildLogDirectory: $(BuildLogDirectory) + + - task: PublishPipelineArtifact@1 + displayName: "Publish Reunion NuGet package" + inputs: + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + artifactName: "ProjectReunion-x64-Release" - job: UniversalTest${{ matrix.Name }} From 6ad196c52ed14acebc1a0036b497279c950aa3ed Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:00:16 -0700 Subject: [PATCH 52/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 198358f6adf..6e9f592dc01 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,7 +102,7 @@ - template: ../templates/component-governance.yml - - ${{ if eq(matrix.BuildPlatform, 'x64') and eq (matrix.BuildConfiguration, 'Release') }}: + - ${{ if eq(matrix.BuildPlatform, 'x64') and eq(matrix.BuildConfiguration, 'Release') }}: - task: VSBuild@1 displayName: Reunion ${{parameters.project}} inputs: From 4f1fcd39f6c2e60ccbac0c25b48eee20947614ab Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:03:48 -0700 Subject: [PATCH 53/81] > --- .ado/jobs/universal.yml | 76 +++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 6e9f592dc01..e049239503b 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,45 +102,47 @@ - template: ../templates/component-governance.yml - - ${{ if eq(matrix.BuildPlatform, 'x64') and eq(matrix.BuildConfiguration, 'Release') }}: - - task: VSBuild@1 - displayName: Reunion ${{parameters.project}} - inputs: - solution: vnext/Microsoft.ProjectReunion.ReactNative.sln - platform: x64 - configuration: Release - clean: false # Optional - maximumCpuCount: true # Optional - restoreNugetPackages: true # Optional - createLogFile: true - logFileVerbosity: detailed - msbuildArgs: - /p:PreferredToolArchitecture=x64 - /p:PlatformToolset=x64 - /p:BaseIntDir=$(BaseIntDir) - /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" - /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" - /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" - /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" - /p:PublishToolDuringBuild=true - /p:EnableSourceLink=true - /bl:$(BuildLogDirectory)\MsBuild.binlog - /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err - /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn - /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - /p:RNW_FASTBUILD=true - /p:UseWinUI3=true - - - template: upload-build-logs.yml - parameters: - buildLogDirectory: $(BuildLogDirectory) + - task: VSBuild@1 + displayName: Reunion ${{parameters.project}} + inputs: + solution: vnext/Microsoft.ProjectReunion.ReactNative.sln + platform: x64 + configuration: Release + clean: false # Optional + maximumCpuCount: true # Optional + restoreNugetPackages: true # Optional + createLogFile: true + logFileVerbosity: detailed + msbuildArgs: + /p:PreferredToolArchitecture=x64 + /p:PlatformToolset=x64 + /p:BaseIntDir=$(BaseIntDir) + /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" + /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" + /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" + /p:PublishToolDuringBuild=true + /p:EnableSourceLink=true + /bl:$(BuildLogDirectory)\MsBuild.binlog + /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err + /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn + /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log + /p:RNW_FASTBUILD=true + /p:UseWinUI3=true + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + - - task: PublishPipelineArtifact@1 - displayName: "Publish Reunion NuGet package" - inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg - artifactName: "ProjectReunion-x64-Release" + - template: upload-build-logs.yml + parameters: + buildLogDirectory: $(BuildLogDirectory) + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + - task: PublishPipelineArtifact@1 + displayName: "Publish Reunion NuGet package" + inputs: + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + artifactName: "ProjectReunion-x64-Release" + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - job: UniversalTest${{ matrix.Name }} variables: From 7ab995d0fc029146d9e48fbc4d3e5aebd4339517 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:05:32 -0700 Subject: [PATCH 54/81] > --- .ado/jobs/universal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index e049239503b..b760d99f8e8 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -103,12 +103,12 @@ - template: ../templates/component-governance.yml - task: VSBuild@1 - displayName: Reunion ${{parameters.project}} + displayName: Reunion X64Release inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln platform: x64 configuration: Release - clean: false # Optional + clean: true # Optional maximumCpuCount: true # Optional restoreNugetPackages: true # Optional createLogFile: true From d1cca1dd895aebbd8de037e7cacebaf266b350b1 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:07:18 -0700 Subject: [PATCH 55/81] > --- .ado/jobs/universal.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index b760d99f8e8..145b5bbcbfe 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -104,6 +104,7 @@ - task: VSBuild@1 displayName: Reunion X64Release + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln platform: x64 @@ -114,28 +115,27 @@ createLogFile: true logFileVerbosity: detailed msbuildArgs: + /p:RNW_FASTBUILD=true + /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 /p:PlatformToolset=x64 /p:BaseIntDir=$(BaseIntDir) - /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" - /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" - /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" - /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" - /p:PublishToolDuringBuild=true - /p:EnableSourceLink=true - /bl:$(BuildLogDirectory)\MsBuild.binlog - /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err - /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn - /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - /p:RNW_FASTBUILD=true - /p:UseWinUI3=true - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" + # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" + # /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" + # /p:PublishToolDuringBuild=true + # /p:EnableSourceLink=true + # /bl:$(BuildLogDirectory)\MsBuild.binlog + # /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err + # /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn + # /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - template: upload-build-logs.yml + condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) parameters: buildLogDirectory: $(BuildLogDirectory) - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - task: PublishPipelineArtifact@1 displayName: "Publish Reunion NuGet package" From d0ff728198bbb8da658a31ce1f0adc7bf44de5e7 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:08:30 -0700 Subject: [PATCH 56/81] > --- .ado/jobs/universal.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 145b5bbcbfe..2607255901b 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -132,10 +132,10 @@ # /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - - template: upload-build-logs.yml - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - parameters: - buildLogDirectory: $(BuildLogDirectory) + # - template: upload-build-logs.yml + # condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) + # parameters: + # buildLogDirectory: $(BuildLogDirectory) - task: PublishPipelineArtifact@1 displayName: "Publish Reunion NuGet package" From e023507f657439c532e9bb5712e3e864a43bd101 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:09:33 -0700 Subject: [PATCH 57/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 2607255901b..9af93906594 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -119,7 +119,7 @@ /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 /p:PlatformToolset=x64 - /p:BaseIntDir=$(BaseIntDir) + # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" From 1f826204f09f2dd516555104fb766fe25183c3d5 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 01:50:31 -0700 Subject: [PATCH 58/81] > --- .ado/jobs/universal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 9af93906594..0e4f83131f2 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -107,6 +107,7 @@ condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln + vsVersion: $(MSBuildVersion) platform: x64 configuration: Release clean: true # Optional From d4c1e6d56ae9944b13f8c796b64ad36a4b31dc84 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 02:26:09 -0700 Subject: [PATCH 59/81] > --- .ado/jobs/universal.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 0e4f83131f2..1c7a2b20f52 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -107,12 +107,12 @@ condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) inputs: solution: vnext/Microsoft.ProjectReunion.ReactNative.sln - vsVersion: $(MSBuildVersion) + vsVersion: 16.0 platform: x64 configuration: Release clean: true # Optional maximumCpuCount: true # Optional - restoreNugetPackages: true # Optional + restoreNugetPackages: false # Optional createLogFile: true logFileVerbosity: detailed msbuildArgs: @@ -120,6 +120,7 @@ /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 /p:PlatformToolset=x64 + /restore # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" From 7e9ca8a4327868622e5fe4181db2f0f2b1a9a9fa Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 03:04:43 -0700 Subject: [PATCH 60/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 1c7a2b20f52..43dca7ecabc 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -119,7 +119,7 @@ /p:RNW_FASTBUILD=true /p:UseWinUI3=true /p:PreferredToolArchitecture=x64 - /p:PlatformToolset=x64 + /p:PlatformToolset=v142 /restore # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" From bb579902f631bd83a0db486e69bb2cca96fe1366 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 05:26:34 -0700 Subject: [PATCH 61/81] > --- .ado/jobs/universal.yml | 4 ++-- .../Microsoft.ProjectReunion.ReactNative.csproj | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 43dca7ecabc..4e7888d784a 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -121,8 +121,8 @@ /p:PreferredToolArchitecture=x64 /p:PlatformToolset=v142 /restore + /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:BaseIntDir=$(BaseIntDir) - # /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" # /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" @@ -142,7 +142,7 @@ - task: PublishPipelineArtifact@1 displayName: "Publish Reunion NuGet package" inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.*.nupkg + targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VERSION_STR).nupkg artifactName: "ProjectReunion-x64-Release" condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index a7f8272bf20..3da9b7d7a7d 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -25,6 +25,7 @@ + $(RNW_PKG_VERSION_STR) ..\target\$(Platform)\$(Configuration)\ Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) From fbc5ed9d7b3a04213ee1b46e99138cf3ea5e1f32 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 08:42:03 -0700 Subject: [PATCH 62/81] > --- .../Microsoft.ProjectReunion.ReactNative.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec index 379caf1047b..4256c4f188f 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec @@ -2,7 +2,7 @@ Microsoft.ProjectReunion.ReactNative - 0.0.1-prerelease + $version$ Microsoft React Native for Windows From c12dbd4008ef6375cb40ef7609542c8b94c0dd71 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 10:31:30 -0700 Subject: [PATCH 63/81] > --- .ado/jobs/universal.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 4e7888d784a..5a9c8f7a304 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,6 +102,10 @@ - template: ../templates/component-governance.yml + - template: set-version-vars.yml + parameters: + buildEnvironment: ${{ parameters.buildEnvironment }} + - task: VSBuild@1 displayName: Reunion X64Release condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) From ae1a788f58d1d55902dc5716497c98005faea48e Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 11:01:04 -0700 Subject: [PATCH 64/81] > --- .ado/jobs/universal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 5a9c8f7a304..c99eea2acfb 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,7 +102,7 @@ - template: ../templates/component-governance.yml - - template: set-version-vars.yml + - template: ../templates/set-version-vars.yml parameters: buildEnvironment: ${{ parameters.buildEnvironment }} From ed0cd3391fd7eca37914ea4d81623d8ad055d9d4 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 11:45:04 -0700 Subject: [PATCH 65/81] > --- .ado/jobs/universal.yml | 2 +- .../Microsoft.ProjectReunion.ReactNative.csproj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index c99eea2acfb..2b73341d12e 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -125,7 +125,7 @@ /p:PreferredToolArchitecture=x64 /p:PlatformToolset=v142 /restore - /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" + /p:Version=$(RNW_PKG_VERSION_STR) # /p:BaseIntDir=$(BaseIntDir) # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj index 3da9b7d7a7d..a7f8272bf20 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj @@ -25,7 +25,6 @@ - $(RNW_PKG_VERSION_STR) ..\target\$(Platform)\$(Configuration)\ Microsoft.ProjectReunion.ReactNative.nuspec $(GeneratedNugetDir) From 5b06aec2f141ea50f3083ca49f5170d899935d3b Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 13:44:38 -0700 Subject: [PATCH 66/81] split reunion into its own stage --- .ado/jobs/project-reunion.yml | 57 +++++++++++++++++++ .ado/stages.yml | 6 +- ... Microsoft.ReactNative.ProjectReunion.sln} | 2 +- .../Directory.Build.props | 0 ...crosoft.ReactNative.ProjectReunion.csproj} | 2 +- ...crosoft.ReactNative.ProjectReunion.nuspec} | 2 +- 6 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 .ado/jobs/project-reunion.yml rename vnext/{Microsoft.ProjectReunion.ReactNative.sln => Microsoft.ReactNative.ProjectReunion.sln} (98%) rename vnext/{Microsoft.ProjectReunion.ReactNative => Microsoft.ReactNative.ProjectReunion}/Directory.Build.props (100%) rename vnext/{Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj => Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj} (95%) rename vnext/{Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec => Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec} (93%) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml new file mode 100644 index 00000000000..5e948f2d5ff --- /dev/null +++ b/.ado/jobs/project-reunion.yml @@ -0,0 +1,57 @@ +parameters: + - name: buildEnvironment + type: string + default : PullRequest + values: + - PullRequest + - Continuous + +jobs: + - job: Reunion + displayName: Project Reunion + variables: + - template: ../variables/vs2019.yml + + strategy: + matrix: + # ${{ if eq(parameters.buildEnvironment, 'Continuous') }}: + x64Release: + BuildConfiguration: Release + BuildPlatform: x64 + # X86Debug: + # BuildConfiguration: Debug + # BuildPlatform: x86 + + pool: $(AgentPool.Medium) + timeoutInMinutes: 60 # how long to run the job before automatically cancelling + cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them + + steps: + - checkout: self + clean: false + submodules: false + + - template: ../templates/apply-published-version-vars.yml + + - template: ../templates/build-rnw.yml + parameters: + project: vnext/Microsoft.ReactNative.ProjectReunion.sln + buildPlatform: $(BuildPlatform) + buildConfiguration: $(BuildConfiguration) + msbuildArguments: /p:UseWinUI3=true + + - task: CopyFiles@2 + displayName: Copy NuGet artifacts + inputs: + sourceFolder: $(Build.SourcesDirectory)/vnext/target/${{ parameters.buildPlatform }}/${{ parameters.buildConfiguration }} + targetFolder: $(Build.StagingDirectory)/nuget + contents: Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VER_STR).nupkg + + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact: Project Reunion" + inputs: + artifactName: ReactWindows + pathToPublish: $(Build.StagingDirectory) + parallel: true + + - template: ../templates/component-governance.yml diff --git a/.ado/stages.yml b/.ado/stages.yml index 9c4c4772c56..c8d56de3d5a 100644 --- a/.ado/stages.yml +++ b/.ado/stages.yml @@ -19,9 +19,13 @@ stages: - template: jobs/desktop.yml parameters: buildEnvironment: ${{ parameters.buildEnvironment }} - + - template: jobs/nuget-desktop.yml + - template: jobs/project-reunion.yml + parameters: + buildEnvironment: ${{ parameters.buildEnvironment }} + - template: jobs/cli-init.yml parameters: # The Nuget CLI verification is part of 'Build' to speed up the verification diff --git a/vnext/Microsoft.ProjectReunion.ReactNative.sln b/vnext/Microsoft.ReactNative.ProjectReunion.sln similarity index 98% rename from vnext/Microsoft.ProjectReunion.ReactNative.sln rename to vnext/Microsoft.ReactNative.ProjectReunion.sln index 53c7707221f..4feaac2635c 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.ProjectReunion.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31410.357 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ProjectReunion.ReactNative", "Microsoft.ProjectReunion.ReactNative\Microsoft.ProjectReunion.ReactNative.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ReactNative.ProjectReunion", "Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion.csproj", "{FB80EBB0-1E51-465D-953C-72829AE0E9EF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" EndProject diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props b/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props similarity index 100% rename from vnext/Microsoft.ProjectReunion.ReactNative/Directory.Build.props rename to vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj similarity index 95% rename from vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj rename to vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index a7f8272bf20..d40bb0f087b 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -26,7 +26,7 @@ ..\target\$(Platform)\$(Configuration)\ - Microsoft.ProjectReunion.ReactNative.nuspec + Microsoft.ReactNative.ProjectReunion.nuspec $(GeneratedNugetDir) true diff --git a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec similarity index 93% rename from vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec rename to vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec index 4256c4f188f..69c312192ec 100644 --- a/vnext/Microsoft.ProjectReunion.ReactNative/Microsoft.ProjectReunion.ReactNative.nuspec +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec @@ -10,7 +10,7 @@ - + From 3519077150a5013b790b4c76872a1900477e1e28 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 14:06:18 -0700 Subject: [PATCH 67/81] > --- .ado/jobs/project-reunion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 5e948f2d5ff..3c0ea2e0b26 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -38,7 +38,7 @@ jobs: project: vnext/Microsoft.ReactNative.ProjectReunion.sln buildPlatform: $(BuildPlatform) buildConfiguration: $(BuildConfiguration) - msbuildArguments: /p:UseWinUI3=true + msbuildArguments: /p:UseWinUI3=true /p:Version=$(RNW_PKG_VERSION_STR) - task: CopyFiles@2 displayName: Copy NuGet artifacts From b2d9e53b405626f854447ee9143d7b2dd4c1b5f9 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 14:15:22 -0700 Subject: [PATCH 68/81] > --- .ado/jobs/project-reunion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 3c0ea2e0b26..31214d1f7f0 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -43,7 +43,7 @@ jobs: - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: - sourceFolder: $(Build.SourcesDirectory)/vnext/target/${{ parameters.buildPlatform }}/${{ parameters.buildConfiguration }} + sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) targetFolder: $(Build.StagingDirectory)/nuget contents: Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VER_STR).nupkg From 43b0ca722153f855e541e9e0639bbe0d1206cee8 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 16:11:11 -0700 Subject: [PATCH 69/81] > --- .ado/jobs/project-reunion.yml | 16 ++++++- .ado/publish.yml | 48 +++++++++++++++++++ .ado/templates/prep-and-pack-nuget.yml | 12 +++++ vnext/ExperimentalFeatures.props | 2 +- .../Directory.Build.props | 2 +- ...icrosoft.ReactNative.ProjectReunion.csproj | 17 +++++-- ...icrosoft.ReactNative.ProjectReunion.nuspec | 25 ---------- ...icrosoft.ReactNative.ProjectReunion.nuspec | 25 ++++++++++ 8 files changed, 115 insertions(+), 32 deletions(-) delete mode 100644 vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec create mode 100644 vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 31214d1f7f0..b1c5bd0902b 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -38,7 +38,21 @@ jobs: project: vnext/Microsoft.ReactNative.ProjectReunion.sln buildPlatform: $(BuildPlatform) buildConfiguration: $(BuildConfiguration) - msbuildArguments: /p:UseWinUI3=true /p:Version=$(RNW_PKG_VERSION_STR) + msbuildArguments: /p:UseWinUI3=true + + - task: NuGetToolInstaller@0 + inputs: + versionSpec: ">=5.8.0" + + - template: ../templates/prep-and-pack-nuget.yml + parameters: + packDesktop: false + packMicrosoftReactNative: false + packMicrosoftReactNativeCxx: false + packMicrosoftReactNativeManaged: false + packMicrosoftReactNativeManagedCodeGen: false + packMicrosoftReactNativeProjectReunion: true + slices: '("x64.Release")' - task: CopyFiles@2 displayName: Copy NuGet artifacts diff --git a/.ado/publish.yml b/.ado/publish.yml index ec9fa7e019e..fa44b668186 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -278,11 +278,58 @@ jobs: SearchPattern: vnext/target/**/*.pdb SymbolServerType: TeamServices + - job: RnwNativeBuildReunion + displayName: Build Reunion + dependsOn: RnwNpmPublish + strategy: + matrix: + X64Release: + BuildConfiguration: Release + BuildPlatform: x64 + + pool: + vmImage: $(VmImage) + + steps: + - template: templates/apply-published-version-vars.yml + + - template: templates/build-rnw.yml + parameters: + project: vnext/Microsoft.ReactNative.ProjectReunion.sln + buildPlatform: $(BuildPlatform) + buildConfiguration: $(BuildConfiguration) + msbuildArguments: /p:UseWinUI3=true + + - template: templates/publish-build-artifacts-for-nuget.yml + parameters: + artifactName: ReactWindows + buildPlatform: $(BuildPlatform) + buildConfiguration: $(BuildConfiguration) + layoutHeaders: eq('true', variables['LayoutHeaders']) + contents: | + Microsoft.ReactNative.ProjectReunion\** + + # Ensure EnableCodesign is set properly so CG fails appropriately + - script: | + echo ##vso[task.setvariable variable=EnableCodesign]true + displayName: Set EnableCodesign + condition: or(eq(variables['EnableCodesign'], 'true'), and(endsWith(variables['Build.SourceBranchName'], '-stable'), not(${{ parameters.skipStableCodesign }}))) + + - template: templates/component-governance.yml + + # Make symbols available through http://symweb. + - task: PublishSymbols@2 + displayName: Publish symbols + inputs: + SearchPattern: vnext/target/**/*.pdb + SymbolServerType: TeamServices + - job: RNWNuget dependsOn: - RnwNpmPublish - RnwNativeBuildDesktop - RnwNativeBuildUniversal + - RnwNativeBuildReunion displayName: Sign Binaries and Publish NuGet pool: vmImage: $(VmImage) @@ -301,6 +348,7 @@ jobs: parameters: publishCommitId: $(publishCommitId) npmVersion: $(npmVersion) + packMicrosoftReactNativeProjectReunion: true ${{ if or(eq(variables['EnableCodesign'], 'true'), and(endsWith(variables['Build.SourceBranchName'], '-stable'), not(parameters.skipStableCodesign))) }}: # Sign on stable release builds signMicrosoft: true diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 64e6117dec6..005edcbc318 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -11,6 +11,7 @@ parameters: packMicrosoftReactNativeCxx: true packMicrosoftReactNativeManaged: true packMicrosoftReactNativeManagedCodeGen: true + packMicrosoftReactNativeProjectReunion: false signMicrosoft: false steps: @@ -81,3 +82,14 @@ steps: buildProperties: CommitId=${{parameters.publishCommitId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=x64 codesignBinaries: ${{ parameters.signMicrosoft }} codesignNuget: ${{ parameters.signMicrosoft }} + + - ${{ if eq(parameters.packMicrosoftReactNativeProjectReunion, true) }}: + - template: prep-and-pack-single.yml + parameters: + packageId: Microsoft.ReactNative.ProjectReunion + packageVersion: ${{parameters.npmVersion}} + slices: '' + buildProperties: CommitId=${{parameters.publishCommitId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=x64 + codesignBinaries: ${{ parameters.signMicrosoft }} + codesignNuget: ${{ parameters.signMicrosoft }} + diff --git a/vnext/ExperimentalFeatures.props b/vnext/ExperimentalFeatures.props index 2d53f5087bc..67abaab20dc 100644 --- a/vnext/ExperimentalFeatures.props +++ b/vnext/ExperimentalFeatures.props @@ -1,5 +1,5 @@ - + true \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props b/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props index 4b0f55ded87..4cdf7ef186f 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Directory.Build.props @@ -1,6 +1,6 @@ - $([MSBuild]::NormalizeDirectory('$(SolutionDir)build', '$(Platform)', '$(Configuration)'))\Microsoft.ProjectReunion.ReactNative + $([MSBuild]::NormalizeDirectory('$(SolutionDir)build', '$(Platform)', '$(Configuration)'))\Microsoft.ReactNative.ProjectReunion $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'bin')) $([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'obj')) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index d40bb0f087b..9f39c1664f5 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -25,9 +25,18 @@ - ..\target\$(Platform)\$(Configuration)\ - Microsoft.ReactNative.ProjectReunion.nuspec - $(GeneratedNugetDir) - true + + false + + + + + + + diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec deleted file mode 100644 index 69c312192ec..00000000000 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - Microsoft.ProjectReunion.ReactNative - $version$ - Microsoft - React Native for Windows - - - - - - - - - - - - - - - - - - diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec new file mode 100644 index 00000000000..3dc429803d8 --- /dev/null +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -0,0 +1,25 @@ + + + + Microsoft.ProjectReunion.ReactNative + $version$ + Microsoft + React Native for Windows for Project Reunion apps + + + + + + + + + + + + + + + + + + From a4ae26395ec2517f132855deefa4927ee74a0f49 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 16:39:48 -0700 Subject: [PATCH 70/81] > --- .../Microsoft.ReactNative.ProjectReunion.nuspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec index 3dc429803d8..e16a534c420 100644 --- a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -16,10 +16,10 @@ - - - - - + + + + + From 95a820b92c0ad67f29494545b52e8bf347c19ddf Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 17:04:58 -0700 Subject: [PATCH 71/81] > --- .ado/jobs/project-reunion.yml | 28 ++++++++++---------- .ado/jobs/universal.yml | 48 ----------------------------------- 2 files changed, 14 insertions(+), 62 deletions(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index b1c5bd0902b..1341a8ad4ea 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -40,20 +40,6 @@ jobs: buildConfiguration: $(BuildConfiguration) msbuildArguments: /p:UseWinUI3=true - - task: NuGetToolInstaller@0 - inputs: - versionSpec: ">=5.8.0" - - - template: ../templates/prep-and-pack-nuget.yml - parameters: - packDesktop: false - packMicrosoftReactNative: false - packMicrosoftReactNativeCxx: false - packMicrosoftReactNativeManaged: false - packMicrosoftReactNativeManagedCodeGen: false - packMicrosoftReactNativeProjectReunion: true - slices: '("x64.Release")' - - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: @@ -68,4 +54,18 @@ jobs: pathToPublish: $(Build.StagingDirectory) parallel: true + - task: NuGetToolInstaller@0 + inputs: + versionSpec: ">=5.8.0" + + - template: ../templates/prep-and-pack-nuget.yml + parameters: + packDesktop: false + packMicrosoftReactNative: false + packMicrosoftReactNativeCxx: false + packMicrosoftReactNativeManaged: false + packMicrosoftReactNativeManagedCodeGen: false + packMicrosoftReactNativeProjectReunion: true + slices: '("x64.Release")' + - template: ../templates/component-governance.yml diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml index 2b73341d12e..062b2e4141e 100644 --- a/.ado/jobs/universal.yml +++ b/.ado/jobs/universal.yml @@ -102,54 +102,6 @@ - template: ../templates/component-governance.yml - - template: ../templates/set-version-vars.yml - parameters: - buildEnvironment: ${{ parameters.buildEnvironment }} - - - task: VSBuild@1 - displayName: Reunion X64Release - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - inputs: - solution: vnext/Microsoft.ProjectReunion.ReactNative.sln - vsVersion: 16.0 - platform: x64 - configuration: Release - clean: true # Optional - maximumCpuCount: true # Optional - restoreNugetPackages: false # Optional - createLogFile: true - logFileVerbosity: detailed - msbuildArgs: - /p:RNW_FASTBUILD=true - /p:UseWinUI3=true - /p:PreferredToolArchitecture=x64 - /p:PlatformToolset=v142 - /restore - /p:Version=$(RNW_PKG_VERSION_STR) - # /p:BaseIntDir=$(BaseIntDir) - # /p:RNW_PKG_VERSION_MAJOR="$(RNW_PKG_VERSION_MAJOR)" - # /p:RNW_PKG_VERSION_MINOR="$(RNW_PKG_VERSION_MINOR)" - # /p:RNW_PKG_VERSION_PATCH="$(RNW_PKG_VERSION_PATCH)" - # /p:PublishToolDuringBuild=true - # /p:EnableSourceLink=true - # /bl:$(BuildLogDirectory)\MsBuild.binlog - # /flp1:errorsonly;logfile=$(BuildLogDirectory)\MsBuild.err - # /flp2:warningsonly;logfile=$(BuildLogDirectory)\MsBuild.wrn - # /flp3:verbosity=diagnostic;logfile=$(BuildLogDirectory)\MsBuild.log - - - # - template: upload-build-logs.yml - # condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - # parameters: - # buildLogDirectory: $(BuildLogDirectory) - - - task: PublishPipelineArtifact@1 - displayName: "Publish Reunion NuGet package" - inputs: - targetPath: $(Build.SourcesDirectory)/vnext/target/x64/Release/Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VERSION_STR).nupkg - artifactName: "ProjectReunion-x64-Release" - condition: and(succeeded(), eq('${{ matrix.BuildPlatform }}', 'x64'), eq('${{ matrix.BuildConfiguration }}', 'Release')) - - job: UniversalTest${{ matrix.Name }} variables: - template: ../variables/vs2019.yml From dc1da51be8b308b02f264a28462c12c7bc0b8012 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 18 Jun 2021 19:07:07 -0700 Subject: [PATCH 72/81] > --- vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec index e16a534c420..f19c38bbc71 100644 --- a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -1,7 +1,7 @@ - Microsoft.ProjectReunion.ReactNative + Microsoft.ReactNative.ProjectReunion $version$ Microsoft React Native for Windows for Project Reunion apps @@ -16,6 +16,7 @@ + From b16af32ee2cef0619d8de42aa529cb25cbf2cb8d Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 13:29:36 -0700 Subject: [PATCH 73/81] >> --- .ado/jobs/project-reunion.yml | 8 +++++--- .ado/templates/prep-and-pack-nuget.yml | 2 +- ...Microsoft.ReactNative.ProjectReunion.nuspec | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 1341a8ad4ea..fd01750c56f 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -41,11 +41,13 @@ jobs: msbuildArguments: /p:UseWinUI3=true - task: CopyFiles@2 - displayName: Copy NuGet artifacts + displayName: Copy artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.StagingDirectory)/nuget - contents: Microsoft.ProjectReunion.ReactNative.$(RNW_PKG_VER_STR).nupkg + targetFolder: $(Build.StagingDirectory)/reunion + contents: | + Microsoft.ReactNative\** + Microsoft.ReactNative.ProjectReunion\** - task: PublishBuildArtifacts@1 displayName: "Publish Artifact: Project Reunion" diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 005edcbc318..83d2d31f33c 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)) }}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} diff --git a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec index f19c38bbc71..32f22b17991 100644 --- a/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec +++ b/vnext/Scripts/Microsoft.ReactNative.ProjectReunion.nuspec @@ -2,6 +2,14 @@ Microsoft.ReactNative.ProjectReunion + https://github.com/microsoft/react-native-windows + true + MIT + © Microsoft Corporation. All rights reserved. + + react react-native react-native-windows microsoft c c++ cpp c# csharp reunion projectreunion $version$ Microsoft React Native for Windows for Project Reunion apps @@ -17,10 +25,10 @@ - - - - - + + + + + From 3a20e73f05e6dfebeffc597383c81b3b29f08b57 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 13:43:13 -0700 Subject: [PATCH 74/81] >> --- .ado/publish.yml | 21 ++++++++++++++------- .ado/templates/prep-and-pack-nuget.yml | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index fa44b668186..e61b424c239 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -300,15 +300,22 @@ jobs: buildConfiguration: $(BuildConfiguration) msbuildArguments: /p:UseWinUI3=true - - template: templates/publish-build-artifacts-for-nuget.yml - parameters: - artifactName: ReactWindows - buildPlatform: $(BuildPlatform) - buildConfiguration: $(BuildConfiguration) - layoutHeaders: eq('true', variables['LayoutHeaders']) + - task: CopyFiles@2 + displayName: Copy NuGet artifacts + inputs: + sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) + targetFolder: $(Build.StagingDirectory)/reunion/${(BuildPlatform)/$(BuildConfiguration) contents: | + Microsoft.ReactNative\** Microsoft.ReactNative.ProjectReunion\** - + + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact: ReactWindows" + inputs: + artifactName: ReactWindows + pathToPublish: $(Build.StagingDirectory) + parallel: true + # Ensure EnableCodesign is set properly so CG fails appropriately - script: | echo ##vso[task.setvariable variable=EnableCodesign]true diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 83d2d31f33c..e81750b25cd 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} From a09c5e289d79b261559838a7bdd938d21c16fba3 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 14:14:19 -0700 Subject: [PATCH 75/81] >> --- .ado/templates/prep-and-pack-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index e81750b25cd..2c2fd2ebee8 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeProjectReunion, true))}}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true))}}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} From 2c0a62c830e1c572ecb1dfb519e8c1bee5067da2 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 18:24:21 -0700 Subject: [PATCH 76/81] >>> --- .ado/jobs/project-reunion.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index fd01750c56f..42a0039034d 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -11,7 +11,6 @@ jobs: displayName: Project Reunion variables: - template: ../variables/vs2019.yml - strategy: matrix: # ${{ if eq(parameters.buildEnvironment, 'Continuous') }}: @@ -41,10 +40,10 @@ jobs: msbuildArguments: /p:UseWinUI3=true - task: CopyFiles@2 - displayName: Copy artifacts + displayName: Copy NuGet artifacts inputs: sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration) - targetFolder: $(Build.StagingDirectory)/reunion + targetFolder: $(Build.StagingDirectory)/reunion/$(BuildPlatform)/$(BuildConfiguration) contents: | Microsoft.ReactNative\** Microsoft.ReactNative.ProjectReunion\** @@ -70,4 +69,12 @@ jobs: packMicrosoftReactNativeProjectReunion: true slices: '("x64.Release")' + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact: Project Reunion NuGet" + inputs: + artifactName: ReunionNuGet + pathToPublish: $(Build.SourcesDirectory)/NugetRootFinal/Microsoft.ReactNative.ProjectReunion.0.0.1-pr.nupkg + parallel: true + + - template: ../templates/component-governance.yml From 8b80c997a21d2c514937c35bd231b499dabb4a14 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 21:22:57 -0700 Subject: [PATCH 77/81] pr feedback --- .ado/templates/prep-and-pack-nuget.yml | 2 +- .../Microsoft.ReactNative.ProjectReunion.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml index 2c2fd2ebee8..0cddf2058cb 100644 --- a/.ado/templates/prep-and-pack-nuget.yml +++ b/.ado/templates/prep-and-pack-nuget.yml @@ -21,7 +21,7 @@ steps: artifact: ReactWindows path: $(System.DefaultWorkingDirectory)/ReactWindows - - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true))}}: + - ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeProjectReunion, false)) }}: - powershell: | (Get-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path $(System.DefaultWorkingDirectory)\ReactWindows\Microsoft.ReactNative.VersionCheck.targets displayName: Patch version check file with version ${{parameters.npmVersion}} diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index 9f39c1664f5..c0081449cec 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.19041.0 + net5.0-windows10.0.17763.0 x64 From 691bf8bbbd2752b6fe8164d936eec7f9f252042e Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 21 Jun 2021 22:32:38 -0700 Subject: [PATCH 78/81] 18362 --- .../Microsoft.ReactNative.ProjectReunion.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index c0081449cec..7c8deade144 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.17763.0 + net5.0-windows10.0.18362.0 x64 From 74a29c15da800c734b79c758329005a2341c7551 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 22 Jun 2021 00:42:41 -0700 Subject: [PATCH 79/81] 19041 --- .../Microsoft.ReactNative.ProjectReunion.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index 7c8deade144..39114716000 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.18362.0 + net5.0-windows10.0.19041.0 x64 @@ -8,7 +8,7 @@ Microsoft.ReactNative $(OutDir) - + @@ -32,9 +32,9 @@ + SourceFiles="..\build\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion\bin\Microsoft.ReactNative.ProjectReunion.dll" + DestinationFolder="..\target\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion" + SkipUnchangedFiles="true" /> From b7baec2abdb7f3a237f705d4c5f77c5d3c897e18 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 22 Jun 2021 01:40:11 -0700 Subject: [PATCH 80/81] >> --- .../Microsoft.ReactNative.ProjectReunion.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj index 39114716000..82b28146eaa 100644 --- a/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj +++ b/vnext/Microsoft.ReactNative.ProjectReunion/Microsoft.ReactNative.ProjectReunion.csproj @@ -32,9 +32,9 @@ + SourceFiles="..\build\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion\Microsoft.ReactNative.ProjectReunion\bin\Microsoft.ReactNative.ProjectReunion.dll" + DestinationFolder="..\target\$(Platform)\$(Configuration)\Microsoft.ReactNative.ProjectReunion" + SkipUnchangedFiles="true" /> From 6110a5f667270bc1b0546b26f01d2fabd8225e3a Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 22 Jun 2021 11:18:51 -0700 Subject: [PATCH 81/81] Copy nuspec --- .ado/jobs/project-reunion.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.ado/jobs/project-reunion.yml b/.ado/jobs/project-reunion.yml index 42a0039034d..644f79000d3 100644 --- a/.ado/jobs/project-reunion.yml +++ b/.ado/jobs/project-reunion.yml @@ -39,6 +39,13 @@ jobs: buildConfiguration: $(BuildConfiguration) msbuildArguments: /p:UseWinUI3=true + - task: CopyFiles@2 + displayName: Copy NuGet artifacts + inputs: + sourceFolder: $(Build.SourcesDirectory)\vnext\scripts + targetFolder: $(Build.StagingDirectory) + contents: Microsoft.ReactNative.ProjectReunion.nuspec + - task: CopyFiles@2 displayName: Copy NuGet artifacts inputs: