Skip to content

Commit 969eb57

Browse files
jviaujviau
authored
Add Microsoft.DotNet.PlatformAbstractiosn back into in-proc (#11031)
* Bring Microsoft.DotNet.PlatformAbstractions back in * Update deps.json * update release notes
1 parent 2c6559d commit 969eb57

File tree

4 files changed

+193
-80
lines changed

4 files changed

+193
-80
lines changed

‎release_notes.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
- Added the option to exclude test data from the `/functions` endpoint API response (#10943)
88
- Avoid circular dependency when resolving LinuxContainerLegionMetricsPublisher. (#10991)
99
- Fixing GrpcWorkerChannel concurrency bug
10-
- Update PowerShell 7.4 worker to 4.0.4206
10+
- Update PowerShell 7.4 worker to 4.0.4206
11+
- Re-add `Microsoft.DotNet.PlatformAbstractions` (#11031)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
5757
<PackageReference Include="Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption" Version="1.0.5" />
5858
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
59-
6059
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.41" />
6160
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
6261
<PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
62+
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
6363
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="$(IdentityDependencyVersion)" />
6464
<PackageReference Include="Microsoft.Security.Utilities" Version="1.3.0" />
6565
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

‎test/WebJobs.Script.Tests/DepsFiles/net6.0/Microsoft.Azure.WebJobs.Script.WebHost.deps.json‎

Lines changed: 95 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"compilationOptions": {},
77
"targets": {
88
".NETCoreApp,Version=v6.0": {
9-
"Microsoft.Azure.WebJobs.Script.WebHost/4.39.100-dev": {
9+
"Microsoft.Azure.WebJobs.Script.WebHost/4.40.100-dev": {
1010
"dependencies": {
1111
"Azure.Data.Tables": "12.8.3",
1212
"Azure.Identity": "1.11.4",
@@ -23,19 +23,20 @@
2323
"Microsoft.Azure.AppService.Proxy.Client": "2.2.20220831.41",
2424
"Microsoft.Azure.Cosmos.Table": "1.0.8",
2525
"Microsoft.Azure.Functions.DotNetIsolatedNativeHost": "1.0.11",
26-
"Microsoft.Azure.Functions.JavaWorker": "2.18.1",
26+
"Microsoft.Azure.Functions.JavaWorker": "2.19.0",
2727
"Microsoft.Azure.Functions.NodeJsWorker": "3.10.1",
2828
"Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption": "1.0.5",
2929
"Microsoft.Azure.Functions.PowerShellWorker.PS7.0": "4.0.3148",
3030
"Microsoft.Azure.Functions.PowerShellWorker.PS7.2": "4.0.4025",
31-
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4": "4.0.4175",
32-
"Microsoft.Azure.Functions.PythonWorker": "4.35.0",
31+
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4": "4.0.4206",
32+
"Microsoft.Azure.Functions.PythonWorker": "4.36.1",
3333
"Microsoft.Azure.Storage.File": "11.1.7",
3434
"Microsoft.Azure.WebJobs": "3.0.41",
3535
"Microsoft.Azure.WebJobs.Host.Storage": "5.0.1",
36-
"Microsoft.Azure.WebJobs.Script": "4.39.100-dev",
37-
"Microsoft.Azure.WebJobs.Script.Grpc": "4.39.100-dev",
36+
"Microsoft.Azure.WebJobs.Script": "4.40.100-dev",
37+
"Microsoft.Azure.WebJobs.Script.Grpc": "4.40.100-dev",
3838
"Microsoft.Azure.WebSites.DataProtection": "2.1.91-alpha",
39+
"Microsoft.DotNet.PlatformAbstractions": "2.1.0",
3940
"Microsoft.Extensions.DependencyModel": "6.0.2",
4041
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.35.0",
4142
"Microsoft.IdentityModel.Tokens": "6.35.0",
@@ -46,8 +47,8 @@
4647
"System.IdentityModel.Tokens.Jwt": "6.35.0",
4748
"System.Memory.Data": "6.0.0",
4849
"System.Net.NameResolution": "4.3.0",
49-
"Microsoft.Azure.WebJobs.Script.Reference": "4.39.0.0",
50-
"Microsoft.Azure.WebJobs.Script.Grpc.Reference": "4.39.0.0"
50+
"Microsoft.Azure.WebJobs.Script.Reference": "4.40.0.0",
51+
"Microsoft.Azure.WebJobs.Script.Grpc.Reference": "4.40.0.0"
5152
},
5253
"runtime": {
5354
"Microsoft.Azure.WebJobs.Script.WebHost.dll": {}
@@ -867,7 +868,7 @@
867868
}
868869
},
869870
"Microsoft.Azure.Functions.DotNetIsolatedNativeHost/1.0.11": {},
870-
"Microsoft.Azure.Functions.JavaWorker/2.18.1": {},
871+
"Microsoft.Azure.Functions.JavaWorker/2.19.0": {},
871872
"Microsoft.Azure.Functions.NodeJsWorker/3.10.1": {},
872873
"Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption/1.0.5": {
873874
"dependencies": {
@@ -883,8 +884,8 @@
883884
},
884885
"Microsoft.Azure.Functions.PowerShellWorker.PS7.0/4.0.3148": {},
885886
"Microsoft.Azure.Functions.PowerShellWorker.PS7.2/4.0.4025": {},
886-
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4/4.0.4175": {},
887-
"Microsoft.Azure.Functions.PythonWorker/4.35.0": {},
887+
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4/4.0.4206": {},
888+
"Microsoft.Azure.Functions.PythonWorker/4.36.1": {},
888889
"Microsoft.Azure.KeyVault.Core/2.0.4": {
889890
"dependencies": {
890891
"System.Runtime": "4.3.1",
@@ -1317,6 +1318,24 @@
13171318
}
13181319
},
13191320
"Microsoft.CSharp/4.7.0": {},
1321+
"Microsoft.DotNet.PlatformAbstractions/2.1.0": {
1322+
"dependencies": {
1323+
"System.AppContext": "4.1.0",
1324+
"System.Collections": "4.3.0",
1325+
"System.IO": "4.3.0",
1326+
"System.IO.FileSystem": "4.3.0",
1327+
"System.Reflection.TypeExtensions": "4.3.0",
1328+
"System.Runtime.Extensions": "4.3.0",
1329+
"System.Runtime.InteropServices": "4.3.0",
1330+
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
1331+
},
1332+
"runtime": {
1333+
"lib/netstandard1.3/Microsoft.DotNet.PlatformAbstractions.dll": {
1334+
"assemblyVersion": "2.1.0.0",
1335+
"fileVersion": "2.1.0.0"
1336+
}
1337+
}
1338+
},
13201339
"Microsoft.Extensions.Azure/1.7.1": {
13211340
"dependencies": {
13221341
"Azure.Core": "1.38.0",
@@ -2013,6 +2032,11 @@
20132032
}
20142033
},
20152034
"StyleCop.Analyzers.Unstable/1.2.0.435": {},
2035+
"System.AppContext/4.1.0": {
2036+
"dependencies": {
2037+
"System.Runtime": "4.3.1"
2038+
}
2039+
},
20162040
"System.Buffers/4.5.1": {},
20172041
"System.ClientModel/1.0.0": {
20182042
"dependencies": {
@@ -2635,6 +2659,17 @@
26352659
"System.Runtime.Handles": "4.3.0"
26362660
}
26372661
},
2662+
"System.Runtime.InteropServices.RuntimeInformation/4.0.0": {
2663+
"dependencies": {
2664+
"Microsoft.NETCore.Platforms": "5.0.0",
2665+
"System.Reflection": "4.3.0",
2666+
"System.Resources.ResourceManager": "4.3.0",
2667+
"System.Runtime": "4.3.1",
2668+
"System.Runtime.InteropServices": "4.3.0",
2669+
"System.Threading": "4.3.0",
2670+
"runtime.native.System": "4.3.0"
2671+
}
2672+
},
26382673
"System.Runtime.Loader/4.3.0": {
26392674
"dependencies": {
26402675
"System.IO": "4.3.0",
@@ -3013,7 +3048,7 @@
30133048
}
30143049
}
30153050
},
3016-
"Microsoft.Azure.WebJobs.Script/4.39.100-dev": {
3051+
"Microsoft.Azure.WebJobs.Script/4.40.100-dev": {
30173052
"dependencies": {
30183053
"Azure.Core": "1.38.0",
30193054
"Azure.Data.Tables": "12.8.3",
@@ -3054,12 +3089,12 @@
30543089
},
30553090
"runtime": {
30563091
"Microsoft.Azure.WebJobs.Script.dll": {
3057-
"assemblyVersion": "4.39.100-dev",
3092+
"assemblyVersion": "4.40.100-dev",
30583093
"fileVersion": ""
30593094
}
30603095
}
30613096
},
3062-
"Microsoft.Azure.WebJobs.Script.Grpc/4.39.100-dev": {
3097+
"Microsoft.Azure.WebJobs.Script.Grpc/4.40.100-dev": {
30633098
"dependencies": {
30643099
"Grpc.AspNetCore": "2.55.0",
30653100
"Microsoft.ApplicationInsights": "2.22.0",
@@ -3068,38 +3103,38 @@
30683103
"Microsoft.ApplicationInsights.WindowsServer": "2.21.0",
30693104
"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0",
30703105
"Microsoft.Azure.WebJobs.Rpc.Core": "3.0.37",
3071-
"Microsoft.Azure.WebJobs.Script": "4.39.100-dev",
3106+
"Microsoft.Azure.WebJobs.Script": "4.40.100-dev",
30723107
"System.IO.FileSystem.Primitives": "4.3.0",
30733108
"System.Threading.Channels": "6.0.0",
30743109
"Yarp.ReverseProxy": "2.0.1"
30753110
},
30763111
"runtime": {
30773112
"Microsoft.Azure.WebJobs.Script.Grpc.dll": {
3078-
"assemblyVersion": "4.39.100-dev",
3113+
"assemblyVersion": "4.40.100-dev",
30793114
"fileVersion": ""
30803115
}
30813116
}
30823117
},
3083-
"Microsoft.Azure.WebJobs.Script.Reference/4.39.0.0": {
3118+
"Microsoft.Azure.WebJobs.Script.Reference/4.40.0.0": {
30843119
"runtime": {
30853120
"Microsoft.Azure.WebJobs.Script.dll": {
3086-
"assemblyVersion": "4.39.0.0",
3121+
"assemblyVersion": "4.40.0.0",
30873122
"fileVersion": "42.42.42.4242"
30883123
}
30893124
}
30903125
},
3091-
"Microsoft.Azure.WebJobs.Script.Grpc.Reference/4.39.0.0": {
3126+
"Microsoft.Azure.WebJobs.Script.Grpc.Reference/4.40.0.0": {
30923127
"runtime": {
30933128
"Microsoft.Azure.WebJobs.Script.Grpc.dll": {
3094-
"assemblyVersion": "4.39.0.0",
3129+
"assemblyVersion": "4.40.0.0",
30953130
"fileVersion": "42.42.42.4242"
30963131
}
30973132
}
30983133
}
30993134
}
31003135
},
31013136
"libraries": {
3102-
"Microsoft.Azure.WebJobs.Script.WebHost/4.39.100-dev": {
3137+
"Microsoft.Azure.WebJobs.Script.WebHost/4.40.100-dev": {
31033138
"type": "project",
31043139
"serviceable": false,
31053140
"sha512": ""
@@ -3657,12 +3692,12 @@
36573692
"path": "microsoft.azure.functions.dotnetisolatednativehost/1.0.11",
36583693
"hashPath": "microsoft.azure.functions.dotnetisolatednativehost.1.0.11.nupkg.sha512"
36593694
},
3660-
"Microsoft.Azure.Functions.JavaWorker/2.18.1": {
3695+
"Microsoft.Azure.Functions.JavaWorker/2.19.0": {
36613696
"type": "package",
36623697
"serviceable": true,
3663-
"sha512": "sha512-XxzCZa9meGb6UTxyc7c/3ls8tG6IkMSCxkt2cdKgGeWX0Ytk1nVpQi2rFsHgVeoS0ZViDPCFMa1jznHyn+Z3Uw==",
3664-
"path": "microsoft.azure.functions.javaworker/2.18.1",
3665-
"hashPath": "microsoft.azure.functions.javaworker.2.18.1.nupkg.sha512"
3698+
"sha512": "sha512-sZbpZQQ+4CSmoKCwZTryI1oJ8rvU2TwvA5u4+Mn/VOt5C1wTZLSiRX2w7fCY34LF5PUhJsi++YzQg8+RGt0LdA==",
3699+
"path": "microsoft.azure.functions.javaworker/2.19.0",
3700+
"hashPath": "microsoft.azure.functions.javaworker.2.19.0.nupkg.sha512"
36663701
},
36673702
"Microsoft.Azure.Functions.NodeJsWorker/3.10.1": {
36683703
"type": "package",
@@ -3692,19 +3727,19 @@
36923727
"path": "microsoft.azure.functions.powershellworker.ps7.2/4.0.4025",
36933728
"hashPath": "microsoft.azure.functions.powershellworker.ps7.2.4.0.4025.nupkg.sha512"
36943729
},
3695-
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4/4.0.4175": {
3730+
"Microsoft.Azure.Functions.PowerShellWorker.PS7.4/4.0.4206": {
36963731
"type": "package",
36973732
"serviceable": true,
3698-
"sha512": "sha512-YEVd2okln/HzCy3ZfOSbX+8vgUHiQb/xeJCIy+Z6fraUxwZXV0K/AeZJnBGBaGJesECecfy+GDtpebKxQoRhlA==",
3699-
"path": "microsoft.azure.functions.powershellworker.ps7.4/4.0.4175",
3700-
"hashPath": "microsoft.azure.functions.powershellworker.ps7.4.4.0.4175.nupkg.sha512"
3733+
"sha512": "sha512-wW1OUKmlb1bN3VeenBjLKzorWwcmQuwM4mEzGgRQqObniZW5b6pQbRoHmwyX6exbRNWoH8OcwQusFqsxPpbvJA==",
3734+
"path": "microsoft.azure.functions.powershellworker.ps7.4/4.0.4206",
3735+
"hashPath": "microsoft.azure.functions.powershellworker.ps7.4.4.0.4206.nupkg.sha512"
37013736
},
3702-
"Microsoft.Azure.Functions.PythonWorker/4.35.0": {
3737+
"Microsoft.Azure.Functions.PythonWorker/4.36.1": {
37033738
"type": "package",
37043739
"serviceable": true,
3705-
"sha512": "sha512-zkQWdqBEx47jzUjQZd/+v3tJ/3VW1hWAiDjVgG6Z6OVrAoCoS8J5r9kzYXapg63M/9VULHy7jTo3xY8zwmso6Q==",
3706-
"path": "microsoft.azure.functions.pythonworker/4.35.0",
3707-
"hashPath": "microsoft.azure.functions.pythonworker.4.35.0.nupkg.sha512"
3740+
"sha512": "sha512-k5XitXh60UV6ppKQi+VxyREocG61xZ5dOcg71aXNnW5EM1t69Zo8IljiFOeZeWHq3Jhm2E2LzU7I2EBuGLZGNA==",
3741+
"path": "microsoft.azure.functions.pythonworker/4.36.1",
3742+
"hashPath": "microsoft.azure.functions.pythonworker.4.36.1.nupkg.sha512"
37083743
},
37093744
"Microsoft.Azure.KeyVault.Core/2.0.4": {
37103745
"type": "package",
@@ -3730,7 +3765,7 @@
37303765
"Microsoft.Azure.WebJobs/3.0.41": {
37313766
"type": "package",
37323767
"serviceable": true,
3733-
"sha512": "sha512-nprqeSOAkhFrpIW1KVkXQb6BZCbnS8d1ytq0nUzIYnpkmbvmfkcQlJE9zp3Dbo26Q/0h0JdPSQ3BaVVBNPOUZg==",
3768+
"sha512": "sha512-EOigHt+kjrpbg53s8SYn4dlTpZG9IgWPNrdmcdSG8c7U8qKZvcF4BwZtF7ETy3KGir2NtIpJaIc7dUm2+k9/GA==",
37343769
"path": "microsoft.azure.webjobs/3.0.41",
37353770
"hashPath": "microsoft.azure.webjobs.3.0.41.nupkg.sha512"
37363771
},
@@ -3765,7 +3800,7 @@
37653800
"Microsoft.Azure.WebJobs.Host.Storage/5.0.1": {
37663801
"type": "package",
37673802
"serviceable": true,
3768-
"sha512": "sha512-eO/sX41oaGkDiXHpT7y/F1F5Wvzm7e1QqFmd4GGMJOMdLOHGvwOvZR82AfR7rjvpqQZWyKjRHqxAVcntq+ZYwQ==",
3803+
"sha512": "sha512-5fF88jDYdxUs4EdYZw3MqK7ghG4mZ5MsCt8MhKk38CiTK90VmoWtXbBYURohil+WJ8vB/i0UwQGg64y6TdvliA==",
37693804
"path": "microsoft.azure.webjobs.host.storage/5.0.1",
37703805
"hashPath": "microsoft.azure.webjobs.host.storage.5.0.1.nupkg.sha512"
37713806
},
@@ -3853,6 +3888,13 @@
38533888
"path": "microsoft.csharp/4.7.0",
38543889
"hashPath": "microsoft.csharp.4.7.0.nupkg.sha512"
38553890
},
3891+
"Microsoft.DotNet.PlatformAbstractions/2.1.0": {
3892+
"type": "package",
3893+
"serviceable": true,
3894+
"sha512": "sha512-9KPDwvb/hLEVXYruVHVZ8BkebC8j17DmPb56LnqRF74HqSPLjCkrlFUjOtFpQPA2DeADBRTI/e69aCfRBfrhxw==",
3895+
"path": "microsoft.dotnet.platformabstractions/2.1.0",
3896+
"hashPath": "microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512"
3897+
},
38563898
"Microsoft.Extensions.Azure/1.7.1": {
38573899
"type": "package",
38583900
"serviceable": true,
@@ -4434,6 +4476,13 @@
44344476
"path": "stylecop.analyzers.unstable/1.2.0.435",
44354477
"hashPath": "stylecop.analyzers.unstable.1.2.0.435.nupkg.sha512"
44364478
},
4479+
"System.AppContext/4.1.0": {
4480+
"type": "package",
4481+
"serviceable": true,
4482+
"sha512": "sha512-3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==",
4483+
"path": "system.appcontext/4.1.0",
4484+
"hashPath": "system.appcontext.4.1.0.nupkg.sha512"
4485+
},
44374486
"System.Buffers/4.5.1": {
44384487
"type": "package",
44394488
"serviceable": true,
@@ -4861,6 +4910,13 @@
48614910
"path": "system.runtime.interopservices/4.3.0",
48624911
"hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512"
48634912
},
4913+
"System.Runtime.InteropServices.RuntimeInformation/4.0.0": {
4914+
"type": "package",
4915+
"serviceable": true,
4916+
"sha512": "sha512-hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==",
4917+
"path": "system.runtime.interopservices.runtimeinformation/4.0.0",
4918+
"hashPath": "system.runtime.interopservices.runtimeinformation.4.0.0.nupkg.sha512"
4919+
},
48644920
"System.Runtime.Loader/4.3.0": {
48654921
"type": "package",
48664922
"serviceable": true,
@@ -5127,22 +5183,22 @@
51275183
"path": "yarp.reverseproxy/2.0.1",
51285184
"hashPath": "yarp.reverseproxy.2.0.1.nupkg.sha512"
51295185
},
5130-
"Microsoft.Azure.WebJobs.Script/4.39.100-dev": {
5186+
"Microsoft.Azure.WebJobs.Script/4.40.100-dev": {
51315187
"type": "project",
51325188
"serviceable": false,
51335189
"sha512": ""
51345190
},
5135-
"Microsoft.Azure.WebJobs.Script.Grpc/4.39.100-dev": {
5191+
"Microsoft.Azure.WebJobs.Script.Grpc/4.40.100-dev": {
51365192
"type": "project",
51375193
"serviceable": false,
51385194
"sha512": ""
51395195
},
5140-
"Microsoft.Azure.WebJobs.Script.Reference/4.39.0.0": {
5196+
"Microsoft.Azure.WebJobs.Script.Reference/4.40.0.0": {
51415197
"type": "reference",
51425198
"serviceable": false,
51435199
"sha512": ""
51445200
},
5145-
"Microsoft.Azure.WebJobs.Script.Grpc.Reference/4.39.0.0": {
5201+
"Microsoft.Azure.WebJobs.Script.Grpc.Reference/4.40.0.0": {
51465202
"type": "reference",
51475203
"serviceable": false,
51485204
"sha512": ""

0 commit comments

Comments
 (0)