Skip to content

Commit 7b61969

Browse files
jviaujviau
committed
Migrate src projects to common packages
1 parent c33151c commit 7b61969

File tree

11 files changed

+177
-110
lines changed

11 files changed

+177
-110
lines changed

‎Directory.Packages.props

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
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="Mono.Posix.NETStandard" Version="1.0.0" />
99+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
100+
</ItemGroup>
101+
102+
<!-- Global packages -->
103+
<ItemGroup>
104+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
105+
</ItemGroup>
106+
107+
</Project>

‎NuGet.config

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,26 @@
66
<add key="Microsoft.Azure.Functions.PowerShellWorker" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json" />
77
<add key="AzureFunctions@internalrelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctions%40internalrelease/nuget/v3/index.json" />
88
<add key="AzureFunctionsRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsRelease/nuget/v3/index.json" />
9-
<add key="AzureFunctionsPreRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsPreRelease/nuget/v3/index.json" />
109
<add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
1110
</packageSources>
11+
<packageSourceMapping>
12+
<packageSource key="nuget.org">
13+
<package pattern="*" />
14+
</packageSource>
15+
<packageSource key="AzureFunctions@internalrelease">
16+
<package pattern="Microsoft.Azure.AppService.*" />
17+
</packageSource>
18+
<packageSource key="Microsoft.Azure.Functions.PowerShellWorker">
19+
<package pattern="Microsoft.Azure.Functions.PowerShellWorker.*" />
20+
</packageSource>
21+
<packageSource key="AzureFunctionsRelease">
22+
<package pattern="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" />
23+
<package pattern="Microsoft.Azure.Functions.JavaWorker" />
24+
<package pattern="Microsoft.Azure.Functions.NodeJSWorker" />
25+
<package pattern="Microsoft.Azure.Functions.PythonWorker" />
26+
</packageSource>
27+
<packageSource key="AzureFunctionsTempStaging">
28+
<package pattern="Microsoft.Azure.WebJobs.*" />
29+
</packageSource>
30+
</packageSourceMapping>
1231
</configuration>

‎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.12" />
4+
<PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" VersionOverride="1.0.12" />
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.10.1" />
4+
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" VersionOverride="3.10.1" />
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.4206" />
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.4206" />
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.38.0" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
5+
<PackageReference Include="Microsoft.Azure.Functions.PythonWorker" VersionOverride="4.38.0" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
66
</ItemGroup>
77

88
</Project>

‎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>

‎src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,19 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
12-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
13-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
14-
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
15-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.22.0" />
16-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
17-
<PackageReference Include="Microsoft.Azure.WebJobs.Rpc.Core" Version="3.0.37" />
18-
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
19-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
20-
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
11+
<PackageReference Include="Grpc.AspNetCore" />
12+
<PackageReference Include="Microsoft.Azure.WebJobs.Rpc.Core" />
2113
</ItemGroup>
2214

2315
<ItemGroup>
2416
<ProjectReference Include="..\WebJobs.Script\WebJobs.Script.csproj" />
2517
</ItemGroup>
2618

2719
<ItemGroup>
28-
<Protobuf Include=".\azure-functions-language-worker-protobuf\src\proto\**\*.proto" GrpcServices="server" ProtoRoot=".\azure-functions-language-worker-protobuf\src\proto" />
20+
<Protobuf
21+
Include=".\azure-functions-language-worker-protobuf\src\proto\**\*.proto"
22+
GrpcServices="server"
23+
ProtoRoot=".\azure-functions-language-worker-protobuf\src\proto" />
2924
</ItemGroup>
3025

3126
</Project>

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<PackageId>Microsoft.Azure.WebJobs.Script.WebHost</PackageId>
1010
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
1111
<TieredCompilation>false</TieredCompilation>
12-
<IdentityDependencyVersion>6.35.0</IdentityDependencyVersion>
1312
<UserSecretsId>dc316708-c8c1-4ef1-90b3-19eb512d96f3</UserSecretsId>
1413
</PropertyGroup>
1514

@@ -50,39 +49,17 @@
5049
</ItemGroup>
5150

5251
<ItemGroup>
53-
<PackageReference Include="Azure.Data.Tables" Version="12.8.3" />
54-
<PackageReference Include="Azure.Identity" Version="1.11.4" />
55-
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
56-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
57-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
58-
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
59-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.22.0" />
60-
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.22.0" />
61-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.8" />
62-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
63-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
64-
<PackageReference Include="Microsoft.Azure.AppService.Middleware.Functions" Version="1.5.5" />
65-
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
66-
<PackageReference Include="Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption" Version="1.0.5" />
67-
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
68-
69-
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.41" />
70-
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
71-
<PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
72-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="$(IdentityDependencyVersion)" />
73-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityDependencyVersion)" />
74-
<PackageReference Include="Microsoft.Security.Utilities" Version="1.3.0" />
75-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
76-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
77-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(IdentityDependencyVersion)" />
78-
79-
<!--
80-
System.IO.FileSystem.AccessControl/5.0.0 pinned to avoid an unintended downgrade to 4.7.0.
81-
See https://github.com/Azure/azure-functions-host/pull/10002
82-
-->
83-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
84-
<PackageReference Include="System.Memory.Data" Version="8.0.1" />
85-
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
52+
<PackageReference Include="Azure.Security.KeyVault.Secrets" />
53+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
54+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
55+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
56+
<PackageReference Include="Microsoft.Azure.AppService.Middleware.Functions" />
57+
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" />
58+
<PackageReference Include="Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption" />
59+
<PackageReference Include="Microsoft.Azure.Storage.File" />
60+
<PackageReference Include="Microsoft.Azure.WebSites.DataProtection" />
61+
<PackageReference Include="Microsoft.Security.Utilities" />
62+
<PackageReference Include="System.Net.NameResolution" />
8663
</ItemGroup>
8764

8865
<ItemGroup>

0 commit comments

Comments
 (0)