Skip to content

Upgrade PowerShell 7.0 language worker dependencies #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Francisco-Gamino merged 9 commits into from
Mar 13, 2023
Merged

Upgrade PowerShell 7.0 language worker dependencies #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3b49e3d
Upgrade to .NET SDK 3.1.426
Francisco-Gamino Mar 10, 2023
46a3244
Upgrade Microsoft.PowerShell.SDK to 7.0.13
Francisco-Gamino Mar 10, 2023
fa14a16
Upgrade CommandLineParser to 2.9.1
Francisco-Gamino Mar 10, 2023
3b71014
Upgrade Google.Protobuf to 3.21.9
Francisco-Gamino Mar 10, 2023
6a89d18
Upgrade Grpc.Core to 2.46.6
Francisco-Gamino Mar 10, 2023
af139b7
Add System.DirectoryServices.Protocols version 5.0.1
Francisco-Gamino Mar 10, 2023
dd0c1c0
Update E2E test project dependencies
Francisco-Gamino Mar 10, 2023
89fb43a
Upgrade unit test project dependencies
Francisco-Gamino Mar 10, 2023
cd0b980
Use LoggerFactory.Create to create the console logger
Francisco-Gamino Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Microsoft.Azure.Functions.PowerShellWorker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.Core" Version="2.27.0" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.12" />
<PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
<PackageReference Include="Grpc.Core" Version="2.46.6" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.13" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Google.Protobuf" Version="3.21.9" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="5.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions ...rker.E2E/Azure.Functions.PowerShellWorker.E2E/Azure.Functions.PowerShellWorker.E2E.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.1.1" />
<PackageReference Include="Microsoft.Azure.EventHubs" Version="2.2.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.2" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.18.0" />
<PackageReference Include="Microsoft.Azure.EventHubs" Version="4.3.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.32" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions ....PowerShellWorker.E2E/Azure.Functions.PowerShellWorker.E2E/Fixtures/FunctionAppFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ public class FunctionAppFixture : IDisposable
public FunctionAppFixture()
{
// initialize logging
#pragma warning disable CS0618 // Type or member is obsolete
ILoggerFactory loggerFactory = new LoggerFactory().AddConsole();
#pragma warning restore CS0618 // Type or member is obsolete
ILoggerFactory loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
_logger = loggerFactory.CreateLogger<FunctionAppFixture>();

// start host via CLI if testing locally
Expand Down
10 changes: 5 additions & 5 deletions test/Unit/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.12" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.13" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tools/helper.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ $RepoRoot = (Resolve-Path "$PSScriptRoot/..").Path
$DotnetSDKVersionRequirements = @{
# We need .NET SDK 3.1 for running the tests, as we still build against the 3.1 framework
'3.1' = @{
MinimalPatch = '422'
DefaultPatch = '422'
MinimalPatch = '426'
DefaultPatch = '426'
}
# We need .NET SDK 5.0 for the updated C# compiler
'5.0' = @{
Expand Down