Skip to content

Commit be83916

Browse files
adelinowonaadelinowona
committed
update download paths to improve caching.
1 parent 448a789 commit be83916

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

‎src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,39 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<LibMongoCryptVersion>r1.15</LibMongoCryptVersion>
18-
<LibMongoCryptCommit>059d538126eb2a1cd90103147bc9b1be0d46de92</LibMongoCryptCommit>
17+
<LibMongoCryptVersionPath>r1.15/2807bca63631a5b6b8affcb7f4402e351166659e</LibMongoCryptVersionPath>
1918
</PropertyGroup>
2019

2120
<Target Name="DownloadNativeBinaries_MacOS"
22-
BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/osx/native/libmongocrypt.dylib')">
21+
BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/osx/native/libmongocrypt.dylib')">
2322
<PropertyGroup>
24-
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
23+
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
2524
<LibMongoCryptSourcePath>lib/libmongocrypt.dylib</LibMongoCryptSourcePath>
26-
<LibMongoCryptPackagePath>runtimes/osx/native</LibMongoCryptPackagePath>
25+
<LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/osx/native</LibMongoCryptPackagePath>
2726
</PropertyGroup>
2827

2928
<MSBuild Projects ="$(MSBuildProjectFullPath)"
3029
Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)"
3130
Targets="DownloadNativeBinary" />
3231
</Target>
3332

34-
<Target Name="DownloadNativeBinaries_UbuntuX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux-x64/native/libmongocrypt.so')">
33+
<Target Name="DownloadNativeBinaries_UbuntuX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-x64/native/libmongocrypt.so')">
3534
<PropertyGroup>
36-
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
35+
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
3736
<LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath>
38-
<LibMongoCryptPackagePath>runtimes/linux-x64/native/</LibMongoCryptPackagePath>
37+
<LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-x64/native/</LibMongoCryptPackagePath>
3938
</PropertyGroup>
4039

4140
<MSBuild Projects ="$(MSBuildProjectFullPath)"
4241
Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)"
4342
Targets="DownloadNativeBinary" />
4443
</Target>
4544

46-
<Target Name="DownloadNativeBinaries_UbuntuARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux-arm64/native/libmongocrypt.so')">
45+
<Target Name="DownloadNativeBinaries_UbuntuARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/libmongocrypt.so')">
4746
<PropertyGroup>
48-
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
47+
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
4948
<LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath>
50-
<LibMongoCryptPackagePath>runtimes/linux-arm64/native/</LibMongoCryptPackagePath>
49+
<LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/</LibMongoCryptPackagePath>
5150
</PropertyGroup>
5251

5352
<MSBuild Projects ="$(MSBuildProjectFullPath)"
@@ -56,35 +55,35 @@
5655
</Target>
5756

5857

59-
<Target Name="DownloadNativeBinaries_AlpineAMD64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux-musl-x64/native/libmongocrypt.so')">
58+
<Target Name="DownloadNativeBinaries_AlpineAMD64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/libmongocrypt.so')">
6059
<PropertyGroup>
61-
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-amd64-earthly/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
60+
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-amd64-earthly/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
6261
<LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath>
63-
<LibMongoCryptPackagePath>runtimes/linux-musl-x64/native/</LibMongoCryptPackagePath>
62+
<LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/</LibMongoCryptPackagePath>
6463
</PropertyGroup>
6564

6665
<MSBuild Projects ="$(MSBuildProjectFullPath)"
6766
Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)"
6867
Targets="DownloadNativeBinary" />
6968
</Target>
7069

71-
<Target Name="DownloadNativeBinaries_AlpineARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/linux-musl-arm64/native/libmongocrypt.so')">
70+
<Target Name="DownloadNativeBinaries_AlpineARM64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/libmongocrypt.so')">
7271
<PropertyGroup>
73-
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
72+
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
7473
<LibMongoCryptSourcePath>nocrypto/lib/libmongocrypt.so</LibMongoCryptSourcePath>
75-
<LibMongoCryptPackagePath>runtimes/linux-musl-arm64/native/</LibMongoCryptPackagePath>
74+
<LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/</LibMongoCryptPackagePath>
7675
</PropertyGroup>
7776

7877
<MSBuild Projects ="$(MSBuildProjectFullPath)"
7978
Properties="TargetFramework=once;LibMongoCryptSourceUrl=$(LibMongoCryptSourceUrl);LibMongoCryptSourcePath=$(LibMongoCryptSourcePath);LibMongoCryptPackagePath=$(LibMongoCryptPackagePath)"
8079
Targets="DownloadNativeBinary" />
8180
</Target>
8281

83-
<Target Name="DownloadNativeBinaries_WindowsX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/runtimes/win-x64/native/mongocrypt.dll')">
82+
<Target Name="DownloadNativeBinaries_WindowsX64" BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/win-x64/native/mongocrypt.dll')">
8483
<PropertyGroup>
85-
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
84+
<LibMongoCryptSourceUrl>https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz</LibMongoCryptSourceUrl>
8685
<LibMongoCryptSourcePath>bin/mongocrypt.dll</LibMongoCryptSourcePath>
87-
<LibMongoCryptPackagePath>runtimes/win-x64/native</LibMongoCryptPackagePath>
86+
<LibMongoCryptPackagePath>$(LibMongoCryptVersionPath)/runtimes/win-x64/native</LibMongoCryptPackagePath>
8887
</PropertyGroup>
8988

9089
<MSBuild Projects ="$(MSBuildProjectFullPath)"
@@ -103,38 +102,44 @@
103102
</Target>
104103

105104
<ItemGroup>
106-
<Content Include="$(MSBuildProjectDirectory)/runtimes/osx/native/libmongocrypt.dylib">
105+
<Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/osx/native/libmongocrypt.dylib">
107106
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
107+
<Link>runtimes\osx\native\libmongocrypt.dylib</Link>
108108
<Pack>true</Pack>
109109
<PackagePath>runtimes\osx\native</PackagePath>
110110
</Content>
111111

112-
<Content Include="$(MSBuildProjectDirectory)/runtimes/linux-x64/native/libmongocrypt.so">
112+
<Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-x64/native/libmongocrypt.so">
113113
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
114+
<Link>runtimes\linux-x64\native\libmongocrypt.so</Link>
114115
<Pack>true</Pack>
115116
<PackagePath>runtimes\linux-x64\native</PackagePath>
116117
</Content>
117118

118-
<Content Include="$(MSBuildProjectDirectory)/runtimes/linux-arm64/native/libmongocrypt.so">
119+
<Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/libmongocrypt.so">
119120
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121+
<Link>runtimes\linux-arm64\native\libmongocrypt.so</Link>
120122
<Pack>true</Pack>
121123
<PackagePath>runtimes\linux-arm64\native</PackagePath>
122124
</Content>
123125

124-
<Content Include="$(MSBuildProjectDirectory)/runtimes/linux-musl-arm64/native/libmongocrypt.so">
126+
<Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/libmongocrypt.so">
125127
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
128+
<Link>runtimes\linux-musl-arm64\native\libmongocrypt.so</Link>
126129
<Pack>true</Pack>
127130
<PackagePath>runtimes\linux-musl-arm64\native</PackagePath>
128131
</Content>
129132

130-
<Content Include="$(MSBuildProjectDirectory)/runtimes/linux-musl-x64/native/libmongocrypt.so">
133+
<Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/libmongocrypt.so">
131134
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
135+
<Link>runtimes\linux-musl-x64\native\libmongocrypt.so</Link>
132136
<Pack>true</Pack>
133137
<PackagePath>runtimes\linux-musl-x64\native</PackagePath>
134138
</Content>
135139

136-
<Content Include="$(MSBuildProjectDirectory)/runtimes/win-x64/native/mongocrypt.dll">
140+
<Content Include="$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/win-x64/native/mongocrypt.dll">
137141
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
142+
<Link>runtimes\win-x64\native\mongocrypt.dll</Link>
138143
<Pack>true</Pack>
139144
<PackagePath>runtimes\win-x64\native</PackagePath>
140145
</Content>

0 commit comments

Comments
 (0)