Skip to content

Commit 0bc03ee

Browse files
gfsgfs
authored
Update Dependencies and use Nuget.Config in pipelines (#171)
* Bump Dependencies * Add Nuget Config * Consume packages from nuget config in pipelines
1 parent df616b3 commit 0bc03ee

7 files changed

Lines changed: 75 additions & 28 deletions

File tree

‎Pipelines/recursive-extractor-pr.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resources:
1313
- repository: templates
1414
type: git
1515
name: SecurityEngineering/OSS-Tools-Pipeline-Templates
16-
ref: refs/tags/v2.0.1
16+
ref: refs/tags/v2.0.4
1717
- repository: 1esPipelines
1818
type: git
1919
name: 1ESPipelineTemplates/1ESPipelineTemplates
@@ -46,6 +46,11 @@ extends:
4646
poolImage: MSSecurity-1ES-Windows-2022
4747
poolOs: windows
4848
dotnetTestArgs: '-- --coverage --report-trx'
49+
includeNuGetOrg: false
50+
nugetFeedsToUse: 'config'
51+
nugetConfigPath: 'nuget.config.azure'
52+
onInit:
53+
- task: NuGetAuthenticate@1
4954
- template: dotnet-test-job.yml@templates
5055
parameters:
5156
jobName: 'cli_dotnet_test_windows'
@@ -55,6 +60,11 @@ extends:
5560
poolImage: MSSecurity-1ES-Windows-2022
5661
poolOs: windows
5762
dotnetTestArgs: '-- --coverage --report-trx'
63+
includeNuGetOrg: false
64+
nugetFeedsToUse: 'config'
65+
nugetConfigPath: 'nuget.config.azure'
66+
onInit:
67+
- task: NuGetAuthenticate@1
5868

5969
- stage: Build
6070
dependsOn:
@@ -69,6 +79,11 @@ extends:
6979
projectName: 'RecursiveExtractor'
7080
customPackFlags: '/p:ContinuousIntegrationBuild=true'
7181
artifactName: 'lib-archive'
82+
includeNuGetOrg: false
83+
nugetFeedsToUse: 'config'
84+
nugetConfigPath: 'nuget.config.azure'
85+
onInit:
86+
- task: NuGetAuthenticate@1
7287
preBuild:
7388
- template: nbgv-set-version-steps.yml@templates
7489
- template: nuget-build-job.yml@templates
@@ -80,5 +95,10 @@ extends:
8095
projectName: 'RecursiveExtractor_CLI'
8196
customPackFlags: '/p:ContinuousIntegrationBuild=true'
8297
artifactName: 'cli-archive'
98+
includeNuGetOrg: false
99+
nugetFeedsToUse: 'config'
100+
nugetConfigPath: 'nuget.config.azure'
101+
onInit:
102+
- task: NuGetAuthenticate@1
83103
preBuild:
84104
- template: nbgv-set-version-steps.yml@templates

‎Pipelines/recursive-extractor-release.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ resources:
77
- repository: templates
88
type: git
99
name: Data/OSS-Tools-Pipeline-Templates
10-
ref: refs/tags/v2.0.1
10+
ref: refs/tags/v2.0.4
1111
- repository: 1esPipelines
1212
type: git
1313
name: 1ESPipelineTemplates/1ESPipelineTemplates
@@ -44,6 +44,11 @@ extends:
4444
poolImage: MSSecurity-1ES-Windows-2022
4545
poolOs: windows
4646
dotnetTestArgs: '-- --coverage --report-trx'
47+
includeNuGetOrg: false
48+
nugetFeedsToUse: 'config'
49+
nugetConfigPath: 'nuget.config.azure'
50+
onInit:
51+
- task: NuGetAuthenticate@1
4752
- template: dotnet-test-job.yml@templates
4853
parameters:
4954
jobName: 'cli_dotnet_test_windows'
@@ -53,6 +58,11 @@ extends:
5358
poolImage: MSSecurity-1ES-Windows-2022
5459
poolOs: windows
5560
dotnetTestArgs: '-- --coverage --report-trx'
61+
includeNuGetOrg: false
62+
nugetFeedsToUse: 'config'
63+
nugetConfigPath: 'nuget.config.azure'
64+
onInit:
65+
- task: NuGetAuthenticate@1
5666

5767
- stage: Build
5868
dependsOn:
@@ -67,6 +77,11 @@ extends:
6777
projectName: 'RecursiveExtractor'
6878
customPackFlags: '/p:ContinuousIntegrationBuild=true'
6979
artifactName: 'lib-archive'
80+
includeNuGetOrg: false
81+
nugetFeedsToUse: 'config'
82+
nugetConfigPath: 'nuget.config.azure'
83+
onInit:
84+
- task: NuGetAuthenticate@1
7085
preBuild:
7186
- template: nbgv-set-version-steps.yml@templates
7287
- template: nuget-build-job.yml@templates
@@ -78,6 +93,11 @@ extends:
7893
projectName: 'RecursiveExtractor_CLI'
7994
customPackFlags: '/p:ContinuousIntegrationBuild=true'
8095
artifactName: 'cli-archive'
96+
includeNuGetOrg: false
97+
nugetFeedsToUse: 'config'
98+
nugetConfigPath: 'nuget.config.azure'
99+
onInit:
100+
- task: NuGetAuthenticate@1
81101
preBuild:
82102
- template: nbgv-set-version-steps.yml@templates
83103

‎RecursiveExtractor.Cli.Tests/RecursiveExtractor.Cli.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
14-
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.1" />
15-
<PackageReference Include="MSTest" Version="3.9.1" />
14+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.3" />
15+
<PackageReference Include="MSTest" Version="3.9.3" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎RecursiveExtractor.Cli/RecursiveExtractor.Cli.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030
<ItemGroup>
3131
<PackageReference Include="CommandLineParser" Version="2.9.1" />
32-
<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
32+
<PackageReference Include="NLog.Extensions.Logging" Version="6.0.1" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="LTRData.DiscUtils.Btrfs" Version="1.0.57" />
13-
<PackageReference Include="LTRData.DiscUtils.HfsPlus" Version="1.0.57" />
14-
<PackageReference Include="LTRData.DiscUtils.SquashFs" Version="1.0.57" />
15-
<PackageReference Include="LTRData.DiscUtils.Xfs" Version="1.0.57" />
16-
<PackageReference Include="NLog.Extensions.Logging" Version="5.5.0" />
12+
<PackageReference Include="LTRData.DiscUtils.Btrfs" Version="1.0.61" />
13+
<PackageReference Include="LTRData.DiscUtils.HfsPlus" Version="1.0.61" />
14+
<PackageReference Include="LTRData.DiscUtils.SquashFs" Version="1.0.61" />
15+
<PackageReference Include="LTRData.DiscUtils.Xfs" Version="1.0.61" />
16+
<PackageReference Include="NLog.Extensions.Logging" Version="6.0.1" />
1717
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
18-
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.1" />
19-
<PackageReference Include="MSTest" Version="3.9.1" />
18+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.3" />
19+
<PackageReference Include="MSTest" Version="3.9.3" />
2020
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2121
</ItemGroup>
2222

‎RecursiveExtractor/RecursiveExtractor.csproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="LTRData.DiscUtils.Btrfs" Version="1.0.57" />
29-
<PackageReference Include="LTRData.DiscUtils.Core" Version="1.0.57" />
30-
<PackageReference Include="LTRData.DiscUtils.Ext" Version="1.0.57" />
31-
<PackageReference Include="LTRData.DiscUtils.Fat" Version="1.0.57" />
32-
<PackageReference Include="LTRData.DiscUtils.HfsPlus" Version="1.0.57" />
33-
<PackageReference Include="LTRData.DiscUtils.Iso9660" Version="1.0.57" />
34-
<PackageReference Include="LTRData.DiscUtils.Ntfs" Version="1.0.57" />
35-
<PackageReference Include="LTRData.DiscUtils.Udf" Version="1.0.57" />
36-
<PackageReference Include="LTRData.DiscUtils.Vhd" Version="1.0.57" />
37-
<PackageReference Include="LTRData.DiscUtils.Vhdx" Version="1.0.57" />
38-
<PackageReference Include="LTRData.DiscUtils.Vmdk" Version="1.0.57" />
39-
<PackageReference Include="LTRData.DiscUtils.Wim" Version="1.0.57" />
40-
<PackageReference Include="LTRData.DiscUtils.Xfs" Version="1.0.57" />
28+
<PackageReference Include="LTRData.DiscUtils.Btrfs" Version="1.0.61" />
29+
<PackageReference Include="LTRData.DiscUtils.Core" Version="1.0.61" />
30+
<PackageReference Include="LTRData.DiscUtils.Ext" Version="1.0.61" />
31+
<PackageReference Include="LTRData.DiscUtils.Fat" Version="1.0.61" />
32+
<PackageReference Include="LTRData.DiscUtils.HfsPlus" Version="1.0.61" />
33+
<PackageReference Include="LTRData.DiscUtils.Iso9660" Version="1.0.61" />
34+
<PackageReference Include="LTRData.DiscUtils.Ntfs" Version="1.0.61" />
35+
<PackageReference Include="LTRData.DiscUtils.Udf" Version="1.0.61" />
36+
<PackageReference Include="LTRData.DiscUtils.Vhd" Version="1.0.61" />
37+
<PackageReference Include="LTRData.DiscUtils.Vhdx" Version="1.0.61" />
38+
<PackageReference Include="LTRData.DiscUtils.Vmdk" Version="1.0.61" />
39+
<PackageReference Include="LTRData.DiscUtils.Wim" Version="1.0.61" />
40+
<PackageReference Include="LTRData.DiscUtils.Xfs" Version="1.0.61" />
4141
<PackageReference Include="Glob" Version="1.1.9" />
42-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
42+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" />
4343
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
44-
<PackageReference Include="NLog" Version="5.5.0" />
44+
<PackageReference Include="NLog" Version="6.0.1" />
4545
<PackageReference Include="SharpCompress" Version="0.40.0" />
4646
<PackageReference Include="SharpZipLib" Version="1.4.2" />
47-
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
47+
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
4848
</ItemGroup>
4949

5050
<ItemGroup>

‎nuget.config.azure‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="PublicRegistriesFeed" value="https://twcsecurityassurance.pkgs.visualstudio.com/SecurityEngineering/_packaging/PublicRegistriesFeed/nuget/v3/index.json" />
6+
</packageSources>
7+
</configuration>

0 commit comments

Comments
 (0)