|
14 | 14 | </PropertyGroup> |
15 | 15 |
|
16 | 16 | <PropertyGroup> |
17 | | - <LibMongoCryptVersionPath>r1.15/2807bca63631a5b6b8affcb7f4402e351166659e</LibMongoCryptVersionPath> |
| 17 | + <LibMongoCryptVersion>1.18.2</LibMongoCryptVersion> |
| 18 | + <LibMongoCryptBaseUrl>https://github.com/mongodb/libmongocrypt/releases/download/$(LibMongoCryptVersion)</LibMongoCryptBaseUrl> |
18 | 19 | </PropertyGroup> |
19 | 20 |
|
20 | 21 | <Target Name="DownloadNativeBinaries_MacOS" |
21 | | - BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/osx/native/libmongocrypt.dylib')"> |
| 22 | + BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/osx/native/libmongocrypt.dylib')"> |
22 | 23 | <PropertyGroup> |
23 | | - <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 24 | + <LibMongoCryptTarball>libmongocrypt-macos-universal-$(LibMongoCryptVersion).tar.gz</LibMongoCryptTarball> |
| 25 | + <LibMongoCryptSourceUrl>$(LibMongoCryptBaseUrl)/$(LibMongoCryptTarball)</LibMongoCryptSourceUrl> |
24 | 26 | <LibMongoCryptSourcePath>lib/libmongocrypt.dylib</LibMongoCryptSourcePath> |
25 | | - <LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/osx/native</LibMongoCryptPackagePath> |
| 27 | + <LibMongoCryptPackagePath>$(LibMongoCryptVersion)/runtimes/osx/native</LibMongoCryptPackagePath> |
26 | 28 | </PropertyGroup> |
27 | 29 |
|
28 | 30 | <MSBuild Projects ="$(MSBuildProjectFullPath)" |
29 | | - Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 31 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptTarball=$(LibMongoCryptTarball);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
30 | 32 | Targets="DownloadNativeBinary" /> |
31 | 33 | </Target> |
32 | 34 |
|
33 | | - <Target Name="DownloadNativeBinaries_UbuntuX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-x64/native/libmongocrypt.so')"> |
| 35 | + <Target Name="DownloadNativeBinaries_UbuntuX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-x64/native/libmongocrypt.so')"> |
34 | 36 | <PropertyGroup> |
35 | | - <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
36 | | - <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
37 | | - <LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-x64/native/</LibMongoCryptPackagePath> |
| 37 | + <LibMongoCryptTarball>libmongocrypt-linux-x86_64-glibc_2_7-nocrypto-$(LibMongoCryptVersion).tar.gz</LibMongoCryptTarball> |
| 38 | + <LibMongoCryptSourceUrl>$(LibMongoCryptBaseUrl)/$(LibMongoCryptTarball)</LibMongoCryptSourceUrl> |
| 39 | + <LibMongoCryptSourcePath>lib64/libmongocrypt.so</LibMongoCryptSourcePath> |
| 40 | + <LibMongoCryptPackagePath>$(LibMongoCryptVersion)/runtimes/linux-x64/native/</LibMongoCryptPackagePath> |
38 | 41 | </PropertyGroup> |
39 | 42 |
|
40 | 43 | <MSBuild Projects ="$(MSBuildProjectFullPath)" |
41 | | - Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 44 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptTarball=$(LibMongoCryptTarball);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
42 | 45 | Targets="DownloadNativeBinary" /> |
43 | 46 | </Target> |
44 | 47 |
|
45 | | - <Target Name="DownloadNativeBinaries_UbuntuARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/libmongocrypt.so')"> |
| 48 | + <Target Name="DownloadNativeBinaries_UbuntuARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-arm64/native/libmongocrypt.so')"> |
46 | 49 | <PropertyGroup> |
47 | | - <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
48 | | - <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
49 | | - <LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/</LibMongoCryptPackagePath> |
| 50 | + <LibMongoCryptTarball>libmongocrypt-linux-arm64-glibc_2_17-nocrypto-$(LibMongoCryptVersion).tar.gz</LibMongoCryptTarball> |
| 51 | + <LibMongoCryptSourceUrl>$(LibMongoCryptBaseUrl)/$(LibMongoCryptTarball)</LibMongoCryptSourceUrl> |
| 52 | + <LibMongoCryptSourcePath>lib64/libmongocrypt.so</LibMongoCryptSourcePath> |
| 53 | + <LibMongoCryptPackagePath>$(LibMongoCryptVersion)/runtimes/linux-arm64/native/</LibMongoCryptPackagePath> |
50 | 54 | </PropertyGroup> |
51 | 55 |
|
52 | 56 | <MSBuild Projects ="$(MSBuildProjectFullPath)" |
53 | | - Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 57 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptTarball=$(LibMongoCryptTarball);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
54 | 58 | Targets="DownloadNativeBinary" /> |
55 | 59 | </Target> |
56 | 60 |
|
57 | | - |
58 | | - <Target Name="DownloadNativeBinaries_AlpineAMD64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/libmongocrypt.so')"> |
| 61 | + <Target Name="DownloadNativeBinaries_AlpineAMD64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-musl-x64/native/libmongocrypt.so')"> |
59 | 62 | <PropertyGroup> |
60 | | - <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-amd64-earthly/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
61 | | - <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
62 | | - <LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/</LibMongoCryptPackagePath> |
| 63 | + <LibMongoCryptTarball>libmongocrypt-linux-x86_64-musl_1_2-nocrypto-$(LibMongoCryptVersion).tar.gz</LibMongoCryptTarball> |
| 64 | + <LibMongoCryptSourceUrl>$(LibMongoCryptBaseUrl)/$(LibMongoCryptTarball)</LibMongoCryptSourceUrl> |
| 65 | + <LibMongoCryptSourcePath>lib/libmongocrypt.so</LibMongoCryptSourcePath> |
| 66 | + <LibMongoCryptPackagePath>$(LibMongoCryptVersion)/runtimes/linux-musl-x64/native/</LibMongoCryptPackagePath> |
63 | 67 | </PropertyGroup> |
64 | 68 |
|
65 | 69 | <MSBuild Projects ="$(MSBuildProjectFullPath)" |
66 | | - Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 70 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptTarball=$(LibMongoCryptTarball);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
67 | 71 | Targets="DownloadNativeBinary" /> |
68 | 72 | </Target> |
69 | 73 |
|
70 | | - <Target Name="DownloadNativeBinaries_AlpineARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/libmongocrypt.so')"> |
| 74 | + <Target Name="DownloadNativeBinaries_AlpineARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-musl-arm64/native/libmongocrypt.so')"> |
71 | 75 | <PropertyGroup> |
72 | | - <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
73 | | - <LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath> |
74 | | - <LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/</LibMongoCryptPackagePath> |
| 76 | + <LibMongoCryptTarball>libmongocrypt-linux-arm64-musl_1_2-nocrypto-$(LibMongoCryptVersion).tar.gz</LibMongoCryptTarball> |
| 77 | + <LibMongoCryptSourceUrl>$(LibMongoCryptBaseUrl)/$(LibMongoCryptTarball)</LibMongoCryptSourceUrl> |
| 78 | + <LibMongoCryptSourcePath>lib/libmongocrypt.so</LibMongoCryptSourcePath> |
| 79 | + <LibMongoCryptPackagePath>$(LibMongoCryptVersion)/runtimes/linux-musl-arm64/native/</LibMongoCryptPackagePath> |
75 | 80 | </PropertyGroup> |
76 | 81 |
|
77 | 82 | <MSBuild Projects ="$(MSBuildProjectFullPath)" |
78 | | - Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 83 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptTarball=$(LibMongoCryptTarball);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
79 | 84 | Targets="DownloadNativeBinary" /> |
80 | 85 | </Target> |
81 | 86 |
|
82 | | - <Target Name="DownloadNativeBinaries_WindowsX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/win-x64/native/mongocrypt.dll')"> |
| 87 | + <Target Name="DownloadNativeBinaries_WindowsX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/win-x64/native/mongocrypt.dll')"> |
83 | 88 | <PropertyGroup> |
84 | | - <LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl> |
| 89 | + <LibMongoCryptTarball>libmongocrypt-windows-x86_64-$(LibMongoCryptVersion).tar.gz</LibMongoCryptTarball> |
| 90 | + <LibMongoCryptSourceUrl>$(LibMongoCryptBaseUrl)/$(LibMongoCryptTarball)</LibMongoCryptSourceUrl> |
85 | 91 | <LibMongoCryptSourcePath>bin/mongocrypt.dll</LibMongoCryptSourcePath> |
86 | | - <LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/win-x64/native</LibMongoCryptPackagePath> |
| 92 | + <LibMongoCryptPackagePath>$(LibMongoCryptVersion)/runtimes/win-x64/native</LibMongoCryptPackagePath> |
87 | 93 | </PropertyGroup> |
88 | 94 |
|
89 | 95 | <MSBuild Projects ="$(MSBuildProjectFullPath)" |
90 | | - Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
| 96 | + Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptTarball=$(LibMongoCryptTarball);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)" |
91 | 97 | Targets="DownloadNativeBinary" /> |
92 | 98 | </Target> |
93 | 99 |
|
94 | 100 | <Target Name="DownloadNativeBinary"> |
95 | 101 | <PropertyGroup> |
96 | 102 | <LibMongoCryptTmpPath>$(IntermediateOutputPath.Replace('\', '/'))$(LibMongoCryptPackagePath)</LibMongoCryptTmpPath> |
| 103 | + <LibMongoCryptAscUrl>$(LibMongoCryptSourceUrl.Replace('.tar.gz','.asc'))</LibMongoCryptAscUrl> |
| 104 | + <LibMongoCryptAscFile>$(LibMongoCryptTarball.Replace('.tar.gz','.asc'))</LibMongoCryptAscFile> |
97 | 105 | </PropertyGroup> |
98 | 106 | <DownloadFile SourceUrl="$(LibMongoCryptSourceUrl)" DestinationFolder="$(LibMongoCryptTmpPath)"/> |
99 | | - <Exec Command="tar -zxvf $(LibMongoCryptTmpPath)/libmongocrypt.tar.gz -C $(LibMongoCryptTmpPath) $(LibMongoCryptSourcePath)" /> |
| 107 | + <DownloadFile SourceUrl="$(LibMongoCryptAscUrl)" DestinationFolder="$(LibMongoCryptTmpPath)"/> |
| 108 | + <DownloadFile SourceUrl="https://pgp.mongodb.com/libmongocrypt.pub" DestinationFolder="$(LibMongoCryptTmpPath)"/> |
| 109 | + <Exec Command='gpg --batch --import "$(LibMongoCryptTmpPath)/libmongocrypt.pub"' Condition="!$([MSBuild]::IsOSPlatform('Windows'))" /> |
| 110 | + <Exec Command='gpg --batch --verify "$(LibMongoCryptTmpPath)/$(LibMongoCryptAscFile)" "$(LibMongoCryptTmpPath)/$(LibMongoCryptTarball)"' Condition="!$([MSBuild]::IsOSPlatform('Windows'))" /> |
| 111 | + <Exec Command='tar -zxvf "$(LibMongoCryptTmpPath)/$(LibMongoCryptTarball)" -C "$(LibMongoCryptTmpPath)" $(LibMongoCryptSourcePath)' /> |
100 | 112 | <Copy SourceFiles="$(LibMongoCryptTmpPath)/$(LibMongoCryptSourcePath)" DestinationFolder="$(MSBuildProjectDirectory)/$(LibMongoCryptPackagePath)" /> |
101 | 113 | <RemoveDir Directories="$(LibMongoCryptTmpPath)" /> |
102 | 114 | </Target> |
103 | 115 |
|
104 | 116 | <ItemGroup> |
105 | | - <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/osx/native/libmongocrypt.dylib"> |
| 117 | + <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/osx/native/libmongocrypt.dylib"> |
106 | 118 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
107 | 119 | <Link>runtimes\osx\native\libmongocrypt.dylib</Link> |
108 | 120 | <Pack>true</Pack> |
109 | 121 | <PackagePath>runtimes\osx\native</PackagePath> |
110 | 122 | </Content> |
111 | 123 |
|
112 | | - <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-x64/native/libmongocrypt.so"> |
| 124 | + <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-x64/native/libmongocrypt.so"> |
113 | 125 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
114 | 126 | <Link>runtimes\linux-x64\native\libmongocrypt.so</Link> |
115 | 127 | <Pack>true</Pack> |
116 | 128 | <PackagePath>runtimes\linux-x64\native</PackagePath> |
117 | 129 | </Content> |
118 | 130 |
|
119 | | - <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/libmongocrypt.so"> |
| 131 | + <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-arm64/native/libmongocrypt.so"> |
120 | 132 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
121 | 133 | <Link>runtimes\linux-arm64\native\libmongocrypt.so</Link> |
122 | 134 | <Pack>true</Pack> |
123 | 135 | <PackagePath>runtimes\linux-arm64\native</PackagePath> |
124 | 136 | </Content> |
125 | 137 |
|
126 | | - <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/libmongocrypt.so"> |
| 138 | + <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-musl-arm64/native/libmongocrypt.so"> |
127 | 139 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
128 | 140 | <Link>runtimes\linux-musl-arm64\native\libmongocrypt.so</Link> |
129 | 141 | <Pack>true</Pack> |
130 | 142 | <PackagePath>runtimes\linux-musl-arm64\native</PackagePath> |
131 | 143 | </Content> |
132 | 144 |
|
133 | | - <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/libmongocrypt.so"> |
| 145 | + <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/linux-musl-x64/native/libmongocrypt.so"> |
134 | 146 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
135 | 147 | <Link>runtimes\linux-musl-x64\native\libmongocrypt.so</Link> |
136 | 148 | <Pack>true</Pack> |
137 | 149 | <PackagePath>runtimes\linux-musl-x64\native</PackagePath> |
138 | 150 | </Content> |
139 | 151 |
|
140 | | - <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/win-x64/native/mongocrypt.dll"> |
| 152 | + <Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersion)/runtimes/win-x64/native/mongocrypt.dll"> |
141 | 153 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
142 | 154 | <Link>runtimes\win-x64\native\mongocrypt.dll</Link> |
143 | 155 | <Pack>true</Pack> |
|
0 commit comments