|
13 | 13 | <NoWarn>CA1060;CA2101;CA1307;SYSLIB0022;SYSLIB0004</NoWarn> |
14 | 14 | </PropertyGroup> |
15 | 15 |
|
16 | | - <PropertyGroup> |
17 | | - <LibMongoCryptMacOsSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptMacOsSourceUrl> |
18 | | - <LibMongoCryptUbuntuX64SourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptUbuntuX64SourceUrl> |
19 | | - <LibMongoCryptUbuntuARM64SourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptUbuntuARM64SourceUrl> |
20 | | - <LibMongoCryptAlpineSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptAlpineSourceUrl> |
21 | | - <LibMongoCryptWindowsSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptWindowsSourceUrl> |
22 | | - </PropertyGroup> |
| 16 | + <Target Name="DownloadNativeBinaries_MacOS" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/osx/native/libmongocrypt.dylib')"> |
| 17 | + <PropertyGroup> |
| 18 | + <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 19 | + <LibMongoCryptSourcePath>lib/libmongocrypt.dylib</LibMongoCryptSourcePath> |
| 20 | + <LibMongoCryptPackagePath>runtimes/osx/native</LibMongoCryptPackagePath> |
| 21 | + </PropertyGroup> |
23 | 22 |
|
24 | | - <Target Name="DownloadNativeBinaries_linux_x64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/linux/x64/libmongocrypt.so')"> |
| 23 | + <MSBuild Projects ="$(MSBuildProjectFullPath)" |
| 24 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 25 | + Targets="DownloadNativeBinary" /> |
| 26 | + </Target> |
| 27 | + |
| 28 | + <Target Name="DownloadNativeBinaries_UbuntuX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux/native/x64/libmongocrypt.so')"> |
25 | 29 | <PropertyGroup> |
26 | | - <IntermediateOutputPathLSF>$(IntermediateOutputPath.Replace('\', '/'))</IntermediateOutputPathLSF> |
| 30 | + <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 31 | + <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
| 32 | + <LibMongoCryptPackagePath>runtimes/linux/native/x64</LibMongoCryptPackagePath> |
27 | 33 | </PropertyGroup> |
28 | | - <DownloadFile |
29 | | - SourceUrl="$(LibMongoCryptUbuntuX64SourceUrl)" |
30 | | - DestinationFolder="$(IntermediateOutputPathLSF)linux/x64"/> |
31 | | - <Exec Command="tar -zxvf $(IntermediateOutputPathLSF)linux/x64/libmongocrypt.tar.gz --strip-components=2 -C $(IntermediateOutputPathLSF)linux/x64 nocrypto/lib/libmongocrypt.so" /> |
32 | | - <Copy SourceFiles="$(IntermediateOutputPathLSF)linux/x64/libmongocrypt.so" DestinationFolder="$(MSBuildProjectDirectory)/linux/x64" Retries="5" RetryDelayMilliseconds="100"/> |
| 34 | + |
| 35 | + <MSBuild Projects ="$(MSBuildProjectFullPath)" |
| 36 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 37 | + Targets="DownloadNativeBinary" /> |
33 | 38 | </Target> |
34 | 39 |
|
35 | | - <Target Name="DownloadNativeBinaries_linux_arm64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/linux/arm64/libmongocrypt.so')"> |
| 40 | + <Target Name="DownloadNativeBinaries_UbuntuARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux/native/arm64/libmongocrypt.so')"> |
36 | 41 | <PropertyGroup> |
37 | | - <IntermediateOutputPathLSF>$(IntermediateOutputPath.Replace('\', '/'))</IntermediateOutputPathLSF> |
| 42 | + <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 43 | + <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
| 44 | + <LibMongoCryptPackagePath>runtimes/linux/native/arm64</LibMongoCryptPackagePath> |
38 | 45 | </PropertyGroup> |
39 | | - <DownloadFile |
40 | | - SourceUrl="$(LibMongoCryptUbuntuARM64SourceUrl)" |
41 | | - DestinationFolder="$(IntermediateOutputPathLSF)linux/arm64"/> |
42 | | - <Exec Command="tar -zxvf $(IntermediateOutputPathLSF)linux/arm64/libmongocrypt.tar.gz --strip-components=2 -C $(IntermediateOutputPathLSF)linux/arm64 nocrypto/lib/libmongocrypt.so" /> |
43 | | - <Copy SourceFiles="$(IntermediateOutputPathLSF)linux/arm64/libmongocrypt.so" DestinationFolder="$(MSBuildProjectDirectory)/linux/arm64" Retries="5" RetryDelayMilliseconds="100"/> |
| 46 | + |
| 47 | + <MSBuild Projects ="$(MSBuildProjectFullPath)" |
| 48 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 49 | + Targets="DownloadNativeBinary" /> |
44 | 50 | </Target> |
45 | 51 |
|
46 | | - <Target Name="DownloadNativeBinaries_macos" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/macos/libmongocrypt.dylib')"> |
| 52 | + <Target Name="DownloadNativeBinaries_Alpine" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux/native/alpine/libmongocrypt.so')"> |
47 | 53 | <PropertyGroup> |
48 | | - <IntermediateOutputPathLSF>$(IntermediateOutputPath.Replace('\', '/'))</IntermediateOutputPathLSF> |
| 54 | + <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 55 | + <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
| 56 | + <LibMongoCryptPackagePath>runtimes/linux/native/alpine</LibMongoCryptPackagePath> |
49 | 57 | </PropertyGroup> |
50 | | - <DownloadFile |
51 | | - SourceUrl="$(LibMongoCryptMacOsSourceUrl)" |
52 | | - DestinationFolder="$(IntermediateOutputPathLSF)macos"/> |
53 | | - <Exec Command="tar -zxvf $(IntermediateOutputPathLSF)macos/libmongocrypt.tar.gz --strip-components=1 -C $(IntermediateOutputPathLSF)macos lib/libmongocrypt.dylib" /> |
54 | | - <Copy SourceFiles="$(IntermediateOutputPathLSF)macos/libmongocrypt.dylib" DestinationFolder="$(MSBuildProjectDirectory)/macos" Retries="5" RetryDelayMilliseconds="100"/> |
| 58 | + |
| 59 | + <MSBuild Projects ="$(MSBuildProjectFullPath)" |
| 60 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 61 | + Targets="DownloadNativeBinary" /> |
55 | 62 | </Target> |
56 | 63 |
|
57 | | - <Target Name="DownloadNativeBinaries_windows" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/windows/mongocrypt.dll')"> |
| 64 | + <Target Name="DownloadNativeBinaries_Windows" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/win/native/mongocrypt.dll')"> |
58 | 65 | <PropertyGroup> |
59 | | - <IntermediateOutputPathLSF>$(IntermediateOutputPath.Replace('\', '/'))</IntermediateOutputPathLSF> |
| 66 | + <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/r1.11/9a88ac5698e8e3ffcd6580b98c247f0126f26c40/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 67 | + <LibMongoCryptSourcePath>bin/mongocrypt.dll</LibMongoCryptSourcePath> |
| 68 | + <LibMongoCryptPackagePath>runtimes/win/native</LibMongoCryptPackagePath> |
60 | 69 | </PropertyGroup> |
61 | | - <DownloadFile |
62 | | - SourceUrl="$(LibMongoCryptWindowsSourceUrl)" |
63 | | - DestinationFolder="$(IntermediateOutputPathLSF)windows"/> |
64 | | - <Exec Command="tar -zxvf $(IntermediateOutputPathLSF)windows/libmongocrypt.tar.gz --strip-components=1 -C $(IntermediateOutputPathLSF)windows bin/mongocrypt.dll" /> |
65 | | - <Copy SourceFiles="$(IntermediateOutputPathLSF)windows/mongocrypt.dll" DestinationFolder="$(MSBuildProjectDirectory)/windows" Retries="5" RetryDelayMilliseconds="100"/> |
| 70 | + |
| 71 | + <MSBuild Projects ="$(MSBuildProjectFullPath)" |
| 72 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 73 | + Targets="DownloadNativeBinary" /> |
66 | 74 | </Target> |
67 | 75 |
|
68 | | - <Target Name="DownloadNativeBinaries_Alpine" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/linux/alpine/libmongocrypt.so')"> |
| 76 | + <Target Name="DownloadNativeBinary"> |
69 | 77 | <PropertyGroup> |
70 | | - <IntermediateOutputPathLSF>$(IntermediateOutputPath.Replace('\', '/'))</IntermediateOutputPathLSF> |
| 78 | + <LibMongoCryptTmpPath>$(IntermediateOutputPath.Replace('\', '/'))$(LibMongoCryptPackagePath)</LibMongoCryptTmpPath> |
71 | 79 | </PropertyGroup> |
72 | | - <DownloadFile |
73 | | - SourceUrl="$(LibMongoCryptAlpineSourceUrl)" |
74 | | - DestinationFolder="$(IntermediateOutputPathLSF)linux/alpine"/> |
75 | | - <Exec Command="tar -zxvf $(IntermediateOutputPathLSF)linux/alpine/libmongocrypt.tar.gz --strip-components=2 -C $(IntermediateOutputPathLSF)linux/alpine nocrypto/lib/libmongocrypt.so" /> |
76 | | - <Copy SourceFiles="$(IntermediateOutputPathLSF)linux/alpine/libmongocrypt.so" DestinationFolder="$(MSBuildProjectDirectory)/linux/alpine" Retries="5" RetryDelayMilliseconds="100"/> |
| 80 | + <DownloadFile SourceUrl="$(LibMongoCryptSourceUrl)" DestinationFolder="$(LibMongoCryptTmpPath)"/> |
| 81 | + <Exec Command="tar -zxvf $(LibMongoCryptTmpPath)/libmongocrypt.tar.gz -C $(LibMongoCryptTmpPath) $(LibMongoCryptSourcePath)" /> |
| 82 | + <Copy SourceFiles="$(LibMongoCryptTmpPath)/$(LibMongoCryptSourcePath)" DestinationFolder="$(MSBuildProjectDirectory)/$(LibMongoCryptPackagePath)" /> |
| 83 | + <RemoveDir Directories="$(LibMongoCryptTmpPath)" /> |
77 | 84 | </Target> |
78 | 85 |
|
79 | 86 | <ItemGroup> |
80 | | - <Content Include="$(MSBuildProjectDirectory)/linux/x64/libmongocrypt.so"> |
81 | | - <Link>libmongocrypt\linux-x64\libmongocrypt.so</Link> |
| 87 | + <Content Include="$(MSBuildProjectDirectory)/runtimes/osx/native/libmongocrypt.dylib"> |
82 | 88 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
83 | 89 | <Pack>true</Pack> |
84 | | - <PackagePath>runtimes\linux\native\x64</PackagePath> |
| 90 | + <PackagePath>runtimes\osx\native</PackagePath> |
85 | 91 | </Content> |
86 | 92 |
|
87 | | - <Content Include="$(MSBuildProjectDirectory)/linux/arm64/libmongocrypt.so"> |
88 | | - <Link>libmongocrypt\linux-arm64\libmongocrypt.so</Link> |
| 93 | + <Content Include="$(MSBuildProjectDirectory)/runtimes/linux/native/x64/libmongocrypt.so"> |
89 | 94 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
90 | 95 | <Pack>true</Pack> |
91 | | - <PackagePath>runtimes\linux\native\arm64</PackagePath> |
| 96 | + <PackagePath>runtimes\linux\native\x64</PackagePath> |
92 | 97 | </Content> |
93 | 98 |
|
94 | | - <Content Include="$(MSBuildProjectDirectory)/linux/alpine/libmongocrypt.so"> |
95 | | - <Link>libmongocrypt\linux-alpine\libmongocrypt.so</Link> |
| 99 | + <Content Include="$(MSBuildProjectDirectory)/runtimes/linux/native/arm64/libmongocrypt.so"> |
96 | 100 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
97 | 101 | <Pack>true</Pack> |
98 | | - <PackagePath>runtimes\linux\native\alpine</PackagePath> |
| 102 | + <PackagePath>runtimes\linux\native\arm64</PackagePath> |
99 | 103 | </Content> |
100 | 104 |
|
101 | | - <Content Include="$(MSBuildProjectDirectory)/macos/libmongocrypt.dylib"> |
102 | | - <Link>libmongocrypt\macos\libmongocrypt.dylib</Link> |
| 105 | + <Content Include="$(MSBuildProjectDirectory)/runtimes/linux/native/alpine/libmongocrypt.so"> |
103 | 106 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
104 | 107 | <Pack>true</Pack> |
105 | | - <PackagePath>runtimes\osx\native</PackagePath> |
| 108 | + <PackagePath>runtimes\linux\native\alpine</PackagePath> |
106 | 109 | </Content> |
107 | 110 |
|
108 | | - <Content Include="$(MSBuildProjectDirectory)/windows/mongocrypt.dll"> |
109 | | - <Link>libmongocrypt\windows\mongocrypt.dll</Link> |
| 111 | + <Content Include="$(MSBuildProjectDirectory)/runtimes/win/native/mongocrypt.dll"> |
110 | 112 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
111 | 113 | <Pack>true</Pack> |
112 | 114 | <PackagePath>runtimes\win\native</PackagePath> |
|
0 commit comments