From 464c3e4c4422d8dadf6aecd1c2752b60f4360638 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Thu, 13 Jun 2019 17:52:30 -0700 Subject: [PATCH 1/4] Use package ReactWindows.OpenSSL.StdCall.Static. --- .../React.Windows.Desktop.DLL.vcxproj | 4 +-- vnext/Desktop.DLL/packages.config | 4 +-- ...t.Windows.Desktop.IntegrationTests.vcxproj | 4 +-- .../Desktop.IntegrationTests/packages.config | 4 +-- .../React.Windows.Desktop.UnitTests.vcxproj | 4 +-- vnext/Desktop.UnitTests/packages.config | 4 +-- vnext/Desktop/React.Windows.Desktop.vcxproj | 4 +-- vnext/Desktop/packages.config | 4 +-- vnext/Scripts/OpenSSL.nuspec | 26 ++++++++++++++++ vnext/Scripts/OpenSSL.targets | 30 +++++++++++++++++++ 10 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 vnext/Scripts/OpenSSL.nuspec create mode 100644 vnext/Scripts/OpenSSL.targets diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index ba71fea2de5..0d3eaef66fd 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -143,7 +143,7 @@ - + @@ -153,7 +153,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/vnext/Desktop.DLL/packages.config b/vnext/Desktop.DLL/packages.config index 108f4b4577d..9020611c713 100644 --- a/vnext/Desktop.DLL/packages.config +++ b/vnext/Desktop.DLL/packages.config @@ -4,5 +4,5 @@ - - \ No newline at end of file + + diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index bd6fc032bae..0832cf9d46c 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -133,7 +133,7 @@ - + @@ -143,7 +143,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/vnext/Desktop.IntegrationTests/packages.config b/vnext/Desktop.IntegrationTests/packages.config index 108f4b4577d..9020611c713 100644 --- a/vnext/Desktop.IntegrationTests/packages.config +++ b/vnext/Desktop.IntegrationTests/packages.config @@ -4,5 +4,5 @@ - - \ No newline at end of file + + diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index f3e1c03d2b8..bc0b5ebe761 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -103,7 +103,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/vnext/Desktop.UnitTests/packages.config b/vnext/Desktop.UnitTests/packages.config index 897ea128c47..a0eefceace6 100644 --- a/vnext/Desktop.UnitTests/packages.config +++ b/vnext/Desktop.UnitTests/packages.config @@ -3,5 +3,5 @@ - - \ No newline at end of file + + diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index f5f90fafd7b..ad2432fe072 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -159,7 +159,7 @@ - + @@ -169,7 +169,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index 108f4b4577d..9020611c713 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -4,5 +4,5 @@ - - \ No newline at end of file + + diff --git a/vnext/Scripts/OpenSSL.nuspec b/vnext/Scripts/OpenSSL.nuspec new file mode 100644 index 00000000000..3c63d081f77 --- /dev/null +++ b/vnext/Scripts/OpenSSL.nuspec @@ -0,0 +1,26 @@ + + + + $id$ + $version$ + OpenSSL for Windows Desktop - Static Library. + Microsoft + https://www.openssl.org + false + + + + + + + + + + + + + + + + + diff --git a/vnext/Scripts/OpenSSL.targets b/vnext/Scripts/OpenSSL.targets new file mode 100644 index 00000000000..d29ffac2f64 --- /dev/null +++ b/vnext/Scripts/OpenSSL.targets @@ -0,0 +1,30 @@ + + + + + + $(MSBuildThisFileDirectory)..\..\include\$(Platform); + %(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)..\..\include\x86; + %(AdditionalIncludeDirectories) + + + + + $(MSBuildThisFileDirectory)..\..\lib\$(Platform)\$(Configuration); + %(AdditionalLibraryDirectories) + + + $(MSBuildThisFileDirectory)..\..\lib\x86\$(Configuration); + %(AdditionalLibraryDirectories) + + + libeay32.lib; + ssleay32.lib; + %(AdditionalDependencies) + + + + \ No newline at end of file From 2377a23aac2c16901c11b48f515521cf735f8efb Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 19 Jun 2019 02:17:42 -0700 Subject: [PATCH 2/4] Vars: Print DefaultPlatformToolset. --- vnext/Directory.Build.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index 23efe85aff1..2131ec7db3b 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -12,6 +12,7 @@ + From 2a35f455e7c807651f32d7e7d65665d01ebff3da Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 19 Jun 2019 03:03:56 -0700 Subject: [PATCH 3/4] OpenSSL - create NuGet from Vcpkg. --- vnext/Scripts/OpenSSL.nuspec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vnext/Scripts/OpenSSL.nuspec b/vnext/Scripts/OpenSSL.nuspec index 3c63d081f77..a79adfe2c41 100644 --- a/vnext/Scripts/OpenSSL.nuspec +++ b/vnext/Scripts/OpenSSL.nuspec @@ -11,16 +11,16 @@ - - - - - + + + + + - - - - - + + + + + From 953a29e23babfe9c171fec6ad5eb40647296124b Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 19 Jun 2019 03:05:03 -0700 Subject: [PATCH 4/4] Upgrade to OpenSSL 1.0.2-p.2. --- vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj | 4 ++-- vnext/Desktop.DLL/packages.config | 2 +- .../React.Windows.Desktop.IntegrationTests.vcxproj | 4 ++-- vnext/Desktop.IntegrationTests/packages.config | 2 +- .../Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj | 4 ++-- vnext/Desktop.UnitTests/packages.config | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 4 ++-- vnext/Desktop/packages.config | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 0d3eaef66fd..92d4c1a1020 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -143,7 +143,7 @@ - + @@ -153,7 +153,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/vnext/Desktop.DLL/packages.config b/vnext/Desktop.DLL/packages.config index 9020611c713..2c00cd689c4 100644 --- a/vnext/Desktop.DLL/packages.config +++ b/vnext/Desktop.DLL/packages.config @@ -4,5 +4,5 @@ - + diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 0832cf9d46c..33b1ab2511c 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -133,7 +133,7 @@ - + @@ -143,7 +143,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/vnext/Desktop.IntegrationTests/packages.config b/vnext/Desktop.IntegrationTests/packages.config index 9020611c713..2c00cd689c4 100644 --- a/vnext/Desktop.IntegrationTests/packages.config +++ b/vnext/Desktop.IntegrationTests/packages.config @@ -4,5 +4,5 @@ - + diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index bc0b5ebe761..ff042123695 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -103,7 +103,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/vnext/Desktop.UnitTests/packages.config b/vnext/Desktop.UnitTests/packages.config index a0eefceace6..e83983f0d80 100644 --- a/vnext/Desktop.UnitTests/packages.config +++ b/vnext/Desktop.UnitTests/packages.config @@ -3,5 +3,5 @@ - + diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index ad2432fe072..f2b56209c0a 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -159,7 +159,7 @@ - + @@ -169,7 +169,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index 9020611c713..2c00cd689c4 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -4,5 +4,5 @@ - +