Skip to content

Commit 5254435

Browse files
github-actions[bot]stevejgordon
github-actions[bot]
and
stevejgordon
authored
Fix determanistic builds and source link (#6718) (#6721)
* Update and cleanup dependencies Includes configure await fixes for bulk operations based on updated analyzer. * Fix source link and determanistic * Further determanistic build configuration Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>
1 parent a452fdd commit 5254435

File tree

20 files changed

+1495
-538
lines changed

20 files changed

+1495
-538
lines changed

‎Directory.Build.props

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<Project>
2+
<Sdk Name="DotNet.ReproducibleBuilds.Isolated" Version="1.1.1" />
3+
24
<!-- Default Version numbers -->
35
<PropertyGroup>
46
<CurrentVersion>8.0.0</CurrentVersion>
@@ -14,6 +16,7 @@
1416
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1517
<MajorVersion>$(Version.Split('.')[0])</MajorVersion>
1618
</PropertyGroup>
19+
1720
<!-- Common Nuget metadata-->
1821
<PropertyGroup>
1922
<Authors>Elastic and contributors</Authors>
@@ -32,7 +35,6 @@
3235
<EnablePackageValidation>true</EnablePackageValidation>
3336
<OutputPath Condition="'$(OutputPathBaseDir)' != ''">$(OutputPathBaseDir)\$(MSBuildProjectName)\</OutputPath>
3437
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))</SolutionRoot>
35-
3638
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
3739
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
3840
<RestoreLockedMode>true</RestoreLockedMode>
@@ -46,7 +48,10 @@
4648
</PropertyGroup>
4749
<ItemGroup>
4850
<!-- Include unconditionally due to difference in how dotnet cli and design time builds generate package.lock.json -->
49-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.2"/>
51+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.3"/>
5052
</ItemGroup>
5153

54+
<ItemGroup>
55+
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All"/>
56+
</ItemGroup>
5257
</Project>

‎Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<NoWarn>1591,1572,1571,1573,1587,1570,NU5048,</NoWarn>
1010
<Prefer32Bit>false</Prefer32Bit>
1111
<DebugSymbols>true</DebugSymbols>
12-
<DebugType>portable</DebugType>
1312

1413
<!-- we need to referenced assemblies during the command line build so that ILRepack can pick them up -->
1514
<CopyLocalLockFileAssemblies Condition="'$(TargetFramework)'=='netstandard2.0'">true</CopyLocalLockFileAssemblies>

‎benchmarks/Benchmarks/packages.lock.json

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,25 @@
2525
"System.ValueTuple": "4.5.0"
2626
}
2727
},
28+
"DotNet.ReproducibleBuilds": {
29+
"type": "Direct",
30+
"requested": "[1.1.1, )",
31+
"resolved": "1.1.1",
32+
"contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
33+
"dependencies": {
34+
"Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
35+
"Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
36+
"Microsoft.SourceLink.GitHub": "1.1.1",
37+
"Microsoft.SourceLink.GitLab": "1.1.1"
38+
}
39+
},
2840
"Microsoft.NETFramework.ReferenceAssemblies": {
2941
"type": "Direct",
30-
"requested": "[1.0.2, )",
31-
"resolved": "1.0.2",
32-
"contentHash": "5/cSEVld+px/CuRrbohO/djfg6++eR6zGpy88MgqloXvkj//WXWpFZyu/OpkXPN0u5m+dN/EVwLNYFUxD4h2+A==",
42+
"requested": "[1.0.3, )",
43+
"resolved": "1.0.3",
44+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
3345
"dependencies": {
34-
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.2"
46+
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
3547
}
3648
},
3749
"NEST": {
@@ -79,6 +91,11 @@
7991
"resolved": "1.8.0",
8092
"contentHash": "KQqoTZg3wf+eqG8ztGqlz9TozC/Dw/jnN82JkIRGZXTg/by0aPiQIMGb+b7hvvkOLnmCuWr3Ghr0mA2I+ASX1A=="
8193
},
94+
"Microsoft.Build.Tasks.Git": {
95+
"type": "Transitive",
96+
"resolved": "1.1.1",
97+
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
98+
},
8299
"Microsoft.CodeAnalysis.Analyzers": {
83100
"type": "Transitive",
84101
"resolved": "2.6.1",
@@ -189,8 +206,49 @@
189206
},
190207
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
191208
"type": "Transitive",
192-
"resolved": "1.0.2",
193-
"contentHash": "8shzGaD5pZi4npuJYCM3de6pl0zlefcbyTIvXIiCdsTqauZ7lAhdaJVtJSqlhYid9VosFAOygBykoJ1SEOlGWA=="
209+
"resolved": "1.0.3",
210+
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
211+
},
212+
"Microsoft.SourceLink.AzureRepos.Git": {
213+
"type": "Transitive",
214+
"resolved": "1.1.1",
215+
"contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
216+
"dependencies": {
217+
"Microsoft.Build.Tasks.Git": "1.1.1",
218+
"Microsoft.SourceLink.Common": "1.1.1"
219+
}
220+
},
221+
"Microsoft.SourceLink.Bitbucket.Git": {
222+
"type": "Transitive",
223+
"resolved": "1.1.1",
224+
"contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
225+
"dependencies": {
226+
"Microsoft.Build.Tasks.Git": "1.1.1",
227+
"Microsoft.SourceLink.Common": "1.1.1"
228+
}
229+
},
230+
"Microsoft.SourceLink.Common": {
231+
"type": "Transitive",
232+
"resolved": "1.1.1",
233+
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
234+
},
235+
"Microsoft.SourceLink.GitHub": {
236+
"type": "Transitive",
237+
"resolved": "1.1.1",
238+
"contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
239+
"dependencies": {
240+
"Microsoft.Build.Tasks.Git": "1.1.1",
241+
"Microsoft.SourceLink.Common": "1.1.1"
242+
}
243+
},
244+
"Microsoft.SourceLink.GitLab": {
245+
"type": "Transitive",
246+
"resolved": "1.1.1",
247+
"contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
248+
"dependencies": {
249+
"Microsoft.Build.Tasks.Git": "1.1.1",
250+
"Microsoft.SourceLink.Common": "1.1.1"
251+
}
194252
},
195253
"Microsoft.Win32.Registry": {
196254
"type": "Transitive",

‎benchmarks/Profiling/packages.lock.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
"version": 1,
33
"dependencies": {
44
"net6.0": {
5+
"DotNet.ReproducibleBuilds": {
6+
"type": "Direct",
7+
"requested": "[1.1.1, )",
8+
"resolved": "1.1.1",
9+
"contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
10+
"dependencies": {
11+
"Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
12+
"Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
13+
"Microsoft.SourceLink.GitHub": "1.1.1",
14+
"Microsoft.SourceLink.GitLab": "1.1.1"
15+
}
16+
},
517
"JetBrains.Profiler.Api": {
618
"type": "Direct",
719
"requested": "[1.1.8, )",
@@ -28,6 +40,11 @@
2840
"System.Text.Json": "6.0.1"
2941
}
3042
},
43+
"Microsoft.Build.Tasks.Git": {
44+
"type": "Transitive",
45+
"resolved": "1.1.1",
46+
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
47+
},
3148
"Microsoft.CSharp": {
3249
"type": "Transitive",
3350
"resolved": "4.7.0",
@@ -38,6 +55,47 @@
3855
"resolved": "1.0.2",
3956
"contentHash": "8shzGaD5pZi4npuJYCM3de6pl0zlefcbyTIvXIiCdsTqauZ7lAhdaJVtJSqlhYid9VosFAOygBykoJ1SEOlGWA=="
4057
},
58+
"Microsoft.SourceLink.AzureRepos.Git": {
59+
"type": "Transitive",
60+
"resolved": "1.1.1",
61+
"contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
62+
"dependencies": {
63+
"Microsoft.Build.Tasks.Git": "1.1.1",
64+
"Microsoft.SourceLink.Common": "1.1.1"
65+
}
66+
},
67+
"Microsoft.SourceLink.Bitbucket.Git": {
68+
"type": "Transitive",
69+
"resolved": "1.1.1",
70+
"contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
71+
"dependencies": {
72+
"Microsoft.Build.Tasks.Git": "1.1.1",
73+
"Microsoft.SourceLink.Common": "1.1.1"
74+
}
75+
},
76+
"Microsoft.SourceLink.Common": {
77+
"type": "Transitive",
78+
"resolved": "1.1.1",
79+
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
80+
},
81+
"Microsoft.SourceLink.GitHub": {
82+
"type": "Transitive",
83+
"resolved": "1.1.1",
84+
"contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
85+
"dependencies": {
86+
"Microsoft.Build.Tasks.Git": "1.1.1",
87+
"Microsoft.SourceLink.Common": "1.1.1"
88+
}
89+
},
90+
"Microsoft.SourceLink.GitLab": {
91+
"type": "Transitive",
92+
"resolved": "1.1.1",
93+
"contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
94+
"dependencies": {
95+
"Microsoft.Build.Tasks.Git": "1.1.1",
96+
"Microsoft.SourceLink.Common": "1.1.1"
97+
}
98+
},
4199
"System.Buffers": {
42100
"type": "Transitive",
43101
"resolved": "4.5.1",

‎build/scripts/Building.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ module Build =
2727
"CurrentVersion", (version.Full.ToString());
2828
"CurrentAssemblyVersion", (version.Assembly.ToString());
2929
"CurrentAssemblyFileVersion", (version.AssemblyFile.ToString());
30+
"ContinuousIntegrationBuild", "true";
3031
]
3132
|> List.map (fun (p,v) -> sprintf "%s=%s" p v)
3233
|> String.concat ";"

‎build/scripts/packages.lock.json

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
"resolved": "3.3.0",
99
"contentHash": "BjYuufZ3EucWK5vzLBFh13Fpb3a4esbnPzvPlAlDLOAzuQaSYRxBqBbHWxAM4c55170pNE07xFTF9DrXuGcCsw=="
1010
},
11+
"DotNet.ReproducibleBuilds": {
12+
"type": "Direct",
13+
"requested": "[1.1.1, )",
14+
"resolved": "1.1.1",
15+
"contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
16+
"dependencies": {
17+
"Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
18+
"Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
19+
"Microsoft.SourceLink.GitHub": "1.1.1",
20+
"Microsoft.SourceLink.GitLab": "1.1.1"
21+
}
22+
},
1123
"Elastic.Elasticsearch.Managed": {
1224
"type": "Direct",
1325
"requested": "[0.3.0, )",
@@ -86,11 +98,11 @@
8698
},
8799
"Microsoft.NETFramework.ReferenceAssemblies": {
88100
"type": "Direct",
89-
"requested": "[1.0.2, )",
90-
"resolved": "1.0.2",
91-
"contentHash": "5/cSEVld+px/CuRrbohO/djfg6++eR6zGpy88MgqloXvkj//WXWpFZyu/OpkXPN0u5m+dN/EVwLNYFUxD4h2+A==",
101+
"requested": "[1.0.3, )",
102+
"resolved": "1.0.3",
103+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
92104
"dependencies": {
93-
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.2"
105+
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
94106
}
95107
},
96108
"Newtonsoft.Json": {
@@ -176,6 +188,11 @@
176188
"Fake.Core.FakeVar": "5.15.0"
177189
}
178190
},
191+
"Microsoft.Build.Tasks.Git": {
192+
"type": "Transitive",
193+
"resolved": "1.1.1",
194+
"contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
195+
},
179196
"Microsoft.NETCore.Platforms": {
180197
"type": "Transitive",
181198
"resolved": "1.1.0",
@@ -188,8 +205,49 @@
188205
},
189206
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
190207
"type": "Transitive",
191-
"resolved": "1.0.2",
192-
"contentHash": "8shzGaD5pZi4npuJYCM3de6pl0zlefcbyTIvXIiCdsTqauZ7lAhdaJVtJSqlhYid9VosFAOygBykoJ1SEOlGWA=="
208+
"resolved": "1.0.3",
209+
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
210+
},
211+
"Microsoft.SourceLink.AzureRepos.Git": {
212+
"type": "Transitive",
213+
"resolved": "1.1.1",
214+
"contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
215+
"dependencies": {
216+
"Microsoft.Build.Tasks.Git": "1.1.1",
217+
"Microsoft.SourceLink.Common": "1.1.1"
218+
}
219+
},
220+
"Microsoft.SourceLink.Bitbucket.Git": {
221+
"type": "Transitive",
222+
"resolved": "1.1.1",
223+
"contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
224+
"dependencies": {
225+
"Microsoft.Build.Tasks.Git": "1.1.1",
226+
"Microsoft.SourceLink.Common": "1.1.1"
227+
}
228+
},
229+
"Microsoft.SourceLink.Common": {
230+
"type": "Transitive",
231+
"resolved": "1.1.1",
232+
"contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
233+
},
234+
"Microsoft.SourceLink.GitHub": {
235+
"type": "Transitive",
236+
"resolved": "1.1.1",
237+
"contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
238+
"dependencies": {
239+
"Microsoft.Build.Tasks.Git": "1.1.1",
240+
"Microsoft.SourceLink.Common": "1.1.1"
241+
}
242+
},
243+
"Microsoft.SourceLink.GitLab": {
244+
"type": "Transitive",
245+
"resolved": "1.1.1",
246+
"contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
247+
"dependencies": {
248+
"Microsoft.Build.Tasks.Git": "1.1.1",
249+
"Microsoft.SourceLink.Common": "1.1.1"
250+
}
193251
},
194252
"Microsoft.Win32.Primitives": {
195253
"type": "Transitive",

0 commit comments

Comments
 (0)