Skip to content

Commit 4a6578b

Browse files
jviauCopilot
jviau
and
Copilot
committed
Migrate src projects to common packages
Update tests to common packaging. Address style issues Revert global.json change Remove package source mapping Add packages.props to tools Simplify some recursive imports Fix test break Update tooling package.props issues Revert NugGet.config Add newline and eof Update assert message Add delay in InitializationLogs_AreEmitted Revert style changes Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]>
1 parent 47bc720 commit 4a6578b

31 files changed

+317
-243
lines changed

‎Directory.Packages.props‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
<IdentityDependencyVersion>6.35.0</IdentityDependencyVersion>
7+
</PropertyGroup>
8+
9+
<!-- Azure packages -->
10+
<ItemGroup>
11+
<PackageVersion Include="Azure.Core" Version="1.45.0" />
12+
<PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />
13+
<PackageVersion Include="Azure.Identity" Version="1.11.4" />
14+
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0-beta.2" />
15+
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
16+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
17+
<PackageVersion Include="Microsoft.Azure.AppService.Middleware.Functions" Version="1.5.5" />
18+
<PackageVersion Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
19+
<PackageVersion Include="Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption" Version="1.0.5" />
20+
<PackageVersion Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
21+
<PackageVersion Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
22+
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.1" />
23+
</ItemGroup>
24+
25+
<!-- AspNetCore Packages -->
26+
<ItemGroup>
27+
<PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
28+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.8" />
29+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" />
30+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
31+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
32+
</ItemGroup>
33+
34+
<!-- Microsoft packages -->
35+
<ItemGroup>
36+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.3.1" />
37+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
38+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
39+
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="$(IdentityDependencyVersion)" />
40+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityDependencyVersion)" />
41+
<PackageVersion Include="Microsoft.Security.Utilities" Version="1.3.0" />
42+
<PackageVersion Include="NuGet.ProjectModel" Version="5.11.6" />
43+
<PackageVersion Include="Yarp.ReverseProxy" Version="2.0.1" />
44+
</ItemGroup>
45+
46+
<!-- WebJobs packages -->
47+
<ItemGroup>
48+
<PackageVersion Include="Microsoft.Azure.WebJobs" Version="3.0.41" />
49+
<PackageVersion Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
50+
<PackageVersion Include="Microsoft.Azure.WebJobs.Rpc.Core" Version="3.0.37" />
51+
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions" Version="5.2.0-12287" />
52+
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
53+
<PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.Timers.Storage" Version="1.0.0-beta.1" />
54+
<PackageVersion Include="Microsoft.Azure.WebJobs.Script.Abstractions" Version="1.0.4-preview" />
55+
<PackageVersion Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.42-12121" />
56+
</ItemGroup>
57+
58+
<!-- Telemetry packages -->
59+
<ItemGroup>
60+
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
61+
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
62+
<PackageVersion Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
63+
<PackageVersion Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.22.0" />
64+
<PackageVersion Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
65+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
66+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
67+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
68+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
69+
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.7" />
70+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
71+
</ItemGroup>
72+
73+
<!-- System packages -->
74+
<ItemGroup>
75+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
76+
<PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
77+
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
78+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="$(IdentityDependencyVersion)" />
79+
<PackageVersion Include="System.IO.Abstractions" Version="2.1.0.227" />
80+
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
81+
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
82+
<PackageVersion Include="System.Memory.Data" Version="8.0.1" />
83+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
84+
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
85+
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
86+
<PackageVersion Include="System.Reactive.Linq" Version="5.0.0" />
87+
<PackageVersion Include="System.Reactive.Core" Version="5.0.0" />
88+
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
89+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="4.7.1" />
90+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
91+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
92+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
93+
<PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
94+
</ItemGroup>
95+
96+
<!-- Other packages -->
97+
<ItemGroup>
98+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
99+
<PackageVersion Include="Mono.Posix.NETStandard" Version="1.0.0" />
100+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
101+
</ItemGroup>
102+
103+
<!-- Global packages -->
104+
<ItemGroup>
105+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
106+
</ItemGroup>
107+
108+
</Project>

‎eng/build/Engineering.props‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,12 @@
55
<WorkersProps>$(EngBuildRoot)Workers.props</WorkersProps>
66
</PropertyGroup>
77

8-
<PropertyGroup>
9-
<!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
10-
<!-- Except for in CI, critical will fail the build. -->
11-
<WarningsNotAsErrors>$(WarningsNotAsErrors)NU1901;NU1902;NU1903;</WarningsNotAsErrors>
12-
<WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904;</WarningsNotAsErrors>
13-
<WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
14-
<NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
15-
<NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
16-
</PropertyGroup>
17-
188
<PropertyGroup>
199
<LangVersion>latest</LangVersion>
2010
<AssemblyOriginatorKeyFile>$(EngResourceRoot)key.snk</AssemblyOriginatorKeyFile>
2111
<CodeAnalysisRuleSet>$(RepoRoot)src.ruleset</CodeAnalysisRuleSet>
22-
<NoWarn>$(NoWarn);NU1701;NU5104</NoWarn>
12+
<!-- TODO: add package source mapping and remove NU1507 suppression -->
13+
<NoWarn>$(NoWarn);NU1701;NU5104;NU1507</NoWarn>
2314
<DebugType>embedded</DebugType>
2415
<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile><!-- https://github.com/dotnet/runtime/issues/54684 -->
2516
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
@@ -30,12 +21,22 @@
3021
<AdditionalFiles Include="$(RepoRoot)stylecop.json" Link="stylecop.json" />
3122
</ItemGroup>
3223

33-
<Import Project="$(MSBuildThisFileDirectory)Release.props" />
34-
3524
<!-- To use PlaceholderSimulation:
3625
1. Set env variable PlaceholderSimulation=true
3726
2. OR build with -p:PlaceholderSimulation=true
3827
-->
3928
<Import Project="$(MSBuildThisFileDirectory)PlaceholderSimulation.props" Condition="'$(PlaceholderSimulation)' == 'true'"/>
29+
<Import Project="$(MSBuildThisFileDirectory)Release.props" />
30+
31+
<!-- Run after Release.props, which sets the CI values-->
32+
<PropertyGroup>
33+
<!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
34+
<!-- Except for in CI, critical will fail the build. -->
35+
<WarningsNotAsErrors>$(WarningsNotAsErrors)NU1901;NU1902;NU1903;</WarningsNotAsErrors>
36+
<WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904;</WarningsNotAsErrors>
37+
<WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
38+
<NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
39+
<NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
40+
</PropertyGroup>
4041

4142
</Project>

‎eng/build/Workers.Dotnet.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" Version="1.0.13" />
4+
<PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" VersionOverride="1.0.13" />
55
</ItemGroup>
66

77
<Target Name="CleanDotnetWorkerFiles" BeforeTargets="AssignTargetPaths" Condition="'$(RuntimeIdentifier)' != ''">

‎eng/build/Workers.Java.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="2.19.2" />
4+
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" VersionOverride="2.19.2" />
55
</ItemGroup>
66

77
</Project>

‎eng/build/Workers.Node.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="3.12.0" />
4+
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" VersionOverride="3.12.0" />
55
</ItemGroup>
66

77
</Project>

‎eng/build/Workers.Powershell.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.0" Version="4.0.3148" />
5-
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.2" Version="4.0.4025" />
6-
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" Version="4.0.4581" />
4+
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.0" VersionOverride="4.0.3148" />
5+
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.2" VersionOverride="4.0.4025" />
6+
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" VersionOverride="4.0.4581" />
77
</ItemGroup>
88

99
<Target Name="RemovePowershellWorkerRuntimes" BeforeTargets="AssignTargetPaths" Condition="'$(RuntimeIdentifier)' != ''">

‎eng/build/Workers.Python.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<ItemGroup>
44
<!-- Python worker does not ship with the host for windows. -->
5-
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" Version="4.40.2" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
5+
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" VersionOverride="4.40.2" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
66
</ItemGroup>
77

88
</Project>

‎perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,17 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
12+
<PackageReference Include="BenchmarkDotNet" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
1316
<ProjectReference Include="../../src/WebJobs.Script/WebJobs.Script.csproj" />
1417
<ProjectReference Include="../../src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj" />
1518
</ItemGroup>
1619

17-
</Project>
20+
<ItemGroup>
21+
<!-- TODO: add back in and address warnings. -->
22+
<GlobalPackageReference Remove="StyleCop.Analyzers" />
23+
</ItemGroup>
24+
25+
</Project>

‎src/Directory.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project>
2-
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
3-
Condition="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')) != ''" />
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
43

54
<!-- artifacts -->
65
<PropertyGroup>

‎src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
11-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
12-
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />
13-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.21.0" />
14-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.21.0" />
15-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
16-
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
17-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
10+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
11+
<PackageReference Include="Newtonsoft.Json" />
1812
</ItemGroup>
1913

2014
</Project>

0 commit comments

Comments
 (0)