Skip to content

Commit 6a13af3

Browse files
andystaplesazfuncghjviau
authored
Patch/4.39.400 (#11009)
* Update version to 4.1039.400 * Clear release notes * Add 'unix' to PowerShell worker runtimes on Linux (#11006) * Add Unix to the kept runtimes for Linux * Update PowerShell 7.4 worker to 4.0.4206 * Update tests for pwsh7.4 default (#10888) --------- Co-authored-by: Jacob Viau <[email protected]> --------- Co-authored-by: Azure Functions Release <[email protected]> Co-authored-by: Jacob Viau <[email protected]>
1 parent 0537263 commit 6a13af3

File tree

6 files changed

+20
-21
lines changed

6 files changed

+20
-21
lines changed

eng/build/Workers.Powershell.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ItemGroup>
44
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.0" Version="4.0.3148" />
55
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.2" Version="4.0.4025" />
6-
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" Version="4.0.4134" />
6+
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" Version="4.0.4206" />
77
</ItemGroup>
88

99
<Target Name="RemovePowershellWorkerRuntimes" BeforeTargets="AssignTargetPaths" Condition="'$(RuntimeIdentifier)' != ''">
1010
<ItemGroup>
1111
<_KeepPowerShellRuntime Include="win;win-x86;win10-x86;win-x64;win10-x64" Condition="$(RuntimeIdentifier.StartsWith(win))" />
12-
<_KeepPowerShellRuntime Include="linux;linux-x64" Condition="$(RuntimeIdentifier.StartsWith(linux))" />
12+
<_KeepPowerShellRuntime Include="linux;linux-x64;unix" Condition="$(RuntimeIdentifier.StartsWith(linux))" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>

release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<!-- Please add your release notes in the following format:
44
- My change description (#PR)
55
-->
6-
- Improved memory metrics reporting using CGroup data for Linux consumption (#10968)
7-
- Avoid circular dependency when resolving LinuxContainerLegionMetricsPublisher. (#10991)
6+
- Add 'unix' to the list of runtimes kept when importing PowerShell worker for Linux builds
7+
- Update PowerShell 7.4 worker to 4.0.4206

src/Directory.Version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>4.1039.300</VersionPrefix>
3+
<VersionPrefix>4.1039.400</VersionPrefix>
44
<UpdateBuildNumber>true</UpdateBuildNumber>
55
</PropertyGroup>
66
</Project>

test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/SpecializationE2ETests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public async Task StartAsync_SetsCorrectActiveHost_RefreshesLanguageWorkerOption
539539
// We want it to start first, but finish last, so unstick it in a couple seconds.
540540
Task ignore = Task.Delay(3000).ContinueWith(_ => _pauseAfterStandbyHostBuild.Release());
541541

542-
var expectedPowerShellVersion = "7.2";
542+
var expectedPowerShellVersion = "7.4";
543543
IWebHost host = builder.Build();
544544
var scriptHostService = host.Services.GetService<WebJobsScriptHostService>();
545545
var channelFactory = host.Services.GetService<IRpcWorkerChannelFactory>();

test/WebJobs.Script.Tests/ScriptHostTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ public async Task Initialize_WithLatestSiteExtensionVersion_LogsWarning()
453453
[InlineData("node", "~3", "~8", "node-~8")]
454454
[InlineData("node", "~2", "~8", "node-~8")]
455455
[InlineData("powershell", "~2", "", "powershell")]
456-
[InlineData("powershell", "~2", "~7", "powershell-~7")]
456+
[InlineData("powershell", "~2", "7.4", "powershell-7.4")]
457457
[InlineData("java", "~3", "", "java")]
458458
public async Task Initialize_WithRuntimeAndWorkerVersion_ReportRuntimeToMetricsTable(
459459
string functionsWorkerRuntime,

test/WebJobs.Script.Tests/Workers/Rpc/RpcWorkerConfigFactoryTests.cs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,25 +154,24 @@ public void DefaultWorkerConfigs_Overrides_DefaultWorkerRuntimeVersion_AppSettin
154154
var scriptSettingsManager = new ScriptSettingsManager(config);
155155
var testLogger = new TestLogger("test");
156156
_testEnvironment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsitePlaceholderMode, "1");
157-
using (var variables = new TestScopedSettings(scriptSettingsManager, testEnvVariables))
158-
{
159-
var configFactory = new RpcWorkerConfigFactory(config, testLogger, _testSysRuntimeInfo, _testEnvironment, new TestMetricsLogger(), _testWorkerProfileManager);
160-
var workerConfigs = configFactory.GetConfigs();
161-
var pythonWorkerConfig = workerConfigs.FirstOrDefault(w => w.Description.Language.Equals("python", StringComparison.OrdinalIgnoreCase));
162-
var powershellWorkerConfig = workerConfigs.FirstOrDefault(w => w.Description.Language.Equals("powershell", StringComparison.OrdinalIgnoreCase));
163-
Assert.Equal(5, workerConfigs.Count);
164-
Assert.NotNull(pythonWorkerConfig);
165-
Assert.NotNull(powershellWorkerConfig);
166-
Assert.Equal("3.8", pythonWorkerConfig.Description.DefaultRuntimeVersion);
167-
Assert.Equal("7.2", powershellWorkerConfig.Description.DefaultRuntimeVersion);
168-
}
157+
158+
using var variables = new TestScopedSettings(scriptSettingsManager, testEnvVariables);
159+
var configFactory = new RpcWorkerConfigFactory(config, testLogger, _testSysRuntimeInfo, _testEnvironment, new TestMetricsLogger(), _testWorkerProfileManager);
160+
var workerConfigs = configFactory.GetConfigs();
161+
var pythonWorkerConfig = workerConfigs.FirstOrDefault(w => w.Description.Language.Equals("python", StringComparison.OrdinalIgnoreCase));
162+
var powershellWorkerConfig = workerConfigs.FirstOrDefault(w => w.Description.Language.Equals("powershell", StringComparison.OrdinalIgnoreCase));
163+
Assert.Equal(5, workerConfigs.Count);
164+
Assert.NotNull(pythonWorkerConfig);
165+
Assert.NotNull(powershellWorkerConfig);
166+
Assert.Equal("3.8", pythonWorkerConfig.Description.DefaultRuntimeVersion);
167+
Assert.Equal("7.4", powershellWorkerConfig.Description.DefaultRuntimeVersion);
169168
}
170169

171170
[Fact]
172171
public void DefaultWorkerConfigs_Overrides_VersionAppSetting()
173172
{
174173
var testEnvironment = new TestEnvironment();
175-
testEnvironment.SetEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME_VERSION", "7.2");
174+
testEnvironment.SetEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME_VERSION", "7.4");
176175
testEnvironment.SetEnvironmentVariable("FUNCTIONS_WORKER_RUNTIME", "powerShell");
177176
var configBuilder = ScriptSettingsManager.CreateDefaultConfigurationBuilder();
178177
var config = configBuilder.Build();
@@ -183,7 +182,7 @@ public void DefaultWorkerConfigs_Overrides_VersionAppSetting()
183182
var powershellWorkerConfig = workerConfigs.FirstOrDefault(w => w.Description.Language.Equals("powershell", StringComparison.OrdinalIgnoreCase));
184183
Assert.Equal(1, workerConfigs.Count);
185184
Assert.NotNull(powershellWorkerConfig);
186-
Assert.Equal("7.2", powershellWorkerConfig.Description.DefaultRuntimeVersion);
185+
Assert.Equal("7.4", powershellWorkerConfig.Description.DefaultRuntimeVersion);
187186
}
188187

189188
[Theory]

0 commit comments

Comments
 (0)