Skip to content

Upgrade assembly versions #12299

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
erich-wang merged 12 commits into from
Aug 4, 2020
Merged

Upgrade assembly versions #12299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3f50023
Upgrade assembly versions
dingmeng-xue Jun 30, 2020
e2282d3
roll back version of log4net
dingmeng-xue Jun 30, 2020
6cb9268
Upgrade Newtonsoft.Json due to PowerShell.SDK
dingmeng-xue Jul 1, 2020
bd9bcd7
Merge remote-tracking branch 'upstream/master' into fix-scan
dingmeng-xue Jul 7, 2020
085b29f
Upgrade PowerShell SDK version to 6.2.4
dingmeng-xue Jul 7, 2020
0b708c8
Upgrade PowerShell SDK version to 6.2.4
dingmeng-xue Jul 7, 2020
58d6437
merge master
dingmeng-xue Jul 15, 2020
7d39712
Merge remote-tracking branch 'upstream/master' into fix-scan
dingmeng-xue Jul 31, 2020
f9fd643
Update versions due to failure detected
dingmeng-xue Jul 31, 2020
a55444e
Merge remote-tracking branch 'upstream/master' into fix-scan
dingmeng-xue Aug 3, 2020
57deda0
Specify dotnet version for test
dingmeng-xue Aug 3, 2020
308a0b1
Add 2.1.x dotnet version
dingmeng-xue Aug 4, 2020
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
19 changes: 19 additions & 0 deletions .azure-pipelines/daily-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Please don't use ADO UI defined scheduled triggers because it takes precedence over YAML scheduled triggers.
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/scheduled-triggers
schedules:
- cron: "0 0 * * *"
displayName: Daily Midnight Build
branches:
include:
- master

pool:
vmImage: 'windows-2019'

steps:
- task: ComponentGovernanceComponentDetection@0
displayName: Component Detection
inputs:
scanType: 'Register'
verbosity: 'Normal'
alertWarningLevel: 'High'
2 changes: 1 addition & 1 deletion .azure-pipelines/powershell-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
displayName: Test
dependsOn: Build
condition: succeeded()
timeoutInMinutes: 120
timeoutInMinutes: 180
strategy:
matrix:
windows:
Expand Down
12 changes: 12 additions & 0 deletions .azure-pipelines/util/test-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ steps:
parameters:
osName: ${{ parameters.osName }}

- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
version: 2.1.x

- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
version: 3.1.x

- task: DotNetCoreCLI@2
displayName: Test
inputs:
Expand Down
12 changes: 6 additions & 6 deletions tools/Common.Netcore.Dependencies.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@


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

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

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

Expand Down
4 changes: 2 additions & 2 deletions tools/VersionController/VersionController.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.5" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.0-preview.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/VersionController/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.5" targetFramework="net452" />
<package id="log4net" version="2.0.8" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="System.Management.Automation_PowerShell_3.0" version="6.3.9600.17400" targetFramework="net452" />
</packages>