Skip to content

Commit eb772b7

Browse files
authored
Upgrade assembly versions (#12299)
* Upgrade assembly versions * roll back version of log4net * Upgrade Newtonsoft.Json due to PowerShell.SDK * Upgrade PowerShell SDK version to 6.2.4 * Upgrade PowerShell SDK version to 6.2.4 * Update versions due to failure detected * Specify dotnet version for test * Add 2.1.x dotnet version
1 parent cd09aea commit eb772b7

File tree

6 files changed

+41
-10
lines changed

6 files changed

+41
-10
lines changed

.azure-pipelines/daily-build.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Please don't use ADO UI defined scheduled triggers because it takes precedence over YAML scheduled triggers.
2+
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/scheduled-triggers
3+
schedules:
4+
- cron: "0 0 * * *"
5+
displayName: Daily Midnight Build
6+
branches:
7+
include:
8+
- master
9+
10+
pool:
11+
vmImage: 'windows-2019'
12+
13+
steps:
14+
- task: ComponentGovernanceComponentDetection@0
15+
displayName: Component Detection
16+
inputs:
17+
scanType: 'Register'
18+
verbosity: 'Normal'
19+
alertWarningLevel: 'High'

.azure-pipelines/powershell-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
displayName: Test
6464
dependsOn: Build
6565
condition: succeeded()
66-
timeoutInMinutes: 120
66+
timeoutInMinutes: 180
6767
strategy:
6868
matrix:
6969
windows:

.azure-pipelines/util/test-steps.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ steps:
99
parameters:
1010
osName: ${{ parameters.osName }}
1111

12+
- task: UseDotNet@2
13+
displayName: 'Use .NET Core sdk'
14+
inputs:
15+
packageType: sdk
16+
version: 2.1.x
17+
18+
- task: UseDotNet@2
19+
displayName: 'Use .NET Core sdk'
20+
inputs:
21+
packageType: sdk
22+
version: 3.1.x
23+
1224
- task: DotNetCoreCLI@2
1325
displayName: Test
1426
inputs:

tools/Common.Netcore.Dependencies.Test.targets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@
3535

3636

3737
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
38-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.4" IncludeAssets="All" />
39-
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3]" />
38+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" IncludeAssets="All" />
39+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
4040
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
4141
</ItemGroup>
4242

4343
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
44-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.1.0-rc.1" IncludeAssets="All" />
45-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
44+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" IncludeAssets="All" />
45+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
4646
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
4747
</ItemGroup>
4848

4949
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
50-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.3" IncludeAssets="All" />
51-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
50+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" IncludeAssets="All" />
51+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
5252
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
5353
</ItemGroup>
5454

tools/VersionController/VersionController.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
2626
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.5" />
28-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
29-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.0-preview.2" />
28+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
29+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" />
3030
</ItemGroup>
3131

3232
<ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="log4net" version="2.0.5" targetFramework="net452" />
3+
<package id="log4net" version="2.0.8" targetFramework="net452" />
44
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
55
<package id="System.Management.Automation_PowerShell_3.0" version="6.3.9600.17400" targetFramework="net452" />
66
</packages>

0 commit comments

Comments
 (0)