Skip to content

Commit 129cf06

Browse files
richardsondevrichardsondev
authored
Update .NET packages and add required YamlDotNet dependencies to package (#45)
Fix issue where newly added YamlDotNet dependencies were not included in the package. Update packages to the latest versions: # Package Update Information | **Package** | **Old Version** | **New Version** | **Category** | |-----------------------------------------|-----------------------------|-----------------------------|--------------------| | Microsoft.Build.Framework | 17.11.4 | 17.12.6 | Build Package | | Microsoft.Build.Utilities.Core | 17.11.4 | 17.12.6 | Build Package | | Microsoft.Bcl.AsyncInterfaces | 9.0.0-rc.2.24473.5 | 9.0.0 | Runtime Package | | System.IO.Pipelines | - | 9.0.0 | Runtime Package | | System.Text.Encodings.Web | - | 9.0.0 | Runtime Package | | System.Text.Json | 9.0.0-rc.2.24473.5 | 9.0.0 | Runtime Package | | YamlDotNet | 16.1.3 | 16.3.0 | Runtime Package | | YamlDotNet.System.Text.Json | 1.6.2 | 1.6.5 | Runtime Package | | coverlet.collector | 6.0.2 | 6.0.3 | Test Package | | Microsoft.NET.Test.Sdk | 17.11.1 | 17.12.0 | Test Package | | MSTest.TestAdapter | 3.6.1 | 3.7.0 | Test Package | | MSTest.TestFramework | 3.6.1 | 3.7.0 | Test Package | | Microsoft.CodeAnalysis.NetAnalyzers | 9.0.0-preview.24454.1 | 9.0.0 | Global Package | | Roslynator.Analyzers | 4.12.8 | 4.12.10 | Global Package |
1 parent 2b307e0 commit 129cf06

File tree

3 files changed

+84
-80
lines changed

3 files changed

+84
-80
lines changed

‎.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
uses: actions/setup-dotnet@v4
3333
with:
3434
dotnet-version: '9.0.x'
35-
dotnet-quality: 'preview'
3635

3736
- name: Set version
3837
id: get_version
@@ -86,7 +85,6 @@ jobs:
8685
uses: actions/setup-dotnet@v4
8786
with:
8887
dotnet-version: '9.0.x'
89-
dotnet-quality: 'preview'
9088

9189
- name: Download NuGetPackage artifact
9290
uses: actions/download-artifact@v4

‎src/Directory.Packages.props

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,32 @@
44
</PropertyGroup>
55
<!-- Build packages-->
66
<ItemGroup>
7-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" PrivateAssets="all" />
8-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.4" PrivateAssets="all" />
7+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" PrivateAssets="all" />
8+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" PrivateAssets="all" />
99
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
1010
</ItemGroup>
1111
<!-- Runtime packages -->
1212
<ItemGroup>
13-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0-rc.2.24473.5" PrivateAssets="all" />
14-
<PackageVersion Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" PrivateAssets="all" />
15-
<PackageVersion Include="YamlDotNet" Version="16.1.3" PrivateAssets="all" GeneratePathProperty="true" />
16-
<PackageVersion Include="YamlDotNet.System.Text.Json" Version="1.6.2" PrivateAssets="all" />
13+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" PrivateAssets="all" />
14+
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" PrivateAssets="all" />
15+
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" PrivateAssets="all" />
16+
<PackageVersion Include="System.Text.Json" Version="9.0.0" PrivateAssets="all" />
17+
<PackageVersion Include="YamlDotNet" Version="16.3.0" PrivateAssets="all" GeneratePathProperty="true" />
18+
<PackageVersion Include="YamlDotNet.System.Text.Json" Version="1.6.5" PrivateAssets="all" />
1719
</ItemGroup>
1820
<!-- Test packages -->
1921
<ItemGroup>
20-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
21-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
22+
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
23+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2224
<PackageVersion Include="Moq" Version="4.20.72" />
23-
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.1" />
24-
<PackageVersion Include="MSTest.TestFramework" Version="3.6.1" />
25+
<PackageVersion Include="MSTest.TestAdapter" Version="3.7.0" />
26+
<PackageVersion Include="MSTest.TestFramework" Version="3.7.0" />
2527
</ItemGroup>
2628
<!-- Global packages -->
2729
<ItemGroup>
2830
<GlobalPackageReference Include="AsyncFixer" Version="1.6.0" />
29-
<GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24454.1" />
31+
<GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
3032
<GlobalPackageReference Include="ReferenceTrimmer" Version="3.3.10" />
31-
<GlobalPackageReference Include="Roslynator.Analyzers" Version="4.12.8" />
33+
<GlobalPackageReference Include="Roslynator.Analyzers" Version="4.12.10" />
3234
</ItemGroup>
3335
</Project>

‎src/Task/AggregateConfigBuildTask.csproj

Lines changed: 70 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,70 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
6-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
7-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
8-
<SourceLinkCreate>true</SourceLinkCreate>
9-
<NoWarn>NU5100,CA1031,CA1819,CA1027</NoWarn>
10-
</PropertyGroup>
11-
12-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
13-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
14-
</PropertyGroup>
15-
16-
<PropertyGroup>
17-
<PackageId>AggregateConfigBuildTask</PackageId>
18-
<Version Condition=" '$(Version)' == '' ">0.0.1</Version>
19-
<Authors>Billy Richardson</Authors>
20-
<Owner>richardsondev</Owner>
21-
<Company>https://richardson.software</Company>
22-
<Description>Merges configuration files at build time, allowing them to be embedded as resources for streamlined deployment and access.</Description>
23-
<PackageTags>yaml, json, arm, build, configuration, msbuild</PackageTags>
24-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
25-
<RepositoryUrl>https://github.com/richardsondev/AggregateConfigBuildTask</RepositoryUrl>
26-
<PackageProjectUrl>https://github.com/richardsondev/AggregateConfigBuildTask</PackageProjectUrl>
27-
<PackageReleaseNotes>https://github.com/richardsondev/AggregateConfigBuildTask/releases/tag/v$(Version)</PackageReleaseNotes>
28-
<PackageReadmeFile>docs/README.md</PackageReadmeFile>
29-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
30-
<IncludeSymbols>true</IncludeSymbols>
31-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32-
<NoPackageAnalysis>true</NoPackageAnalysis>
33-
<BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
34-
<PackageIcon>icon.png</PackageIcon>
35-
</PropertyGroup>
36-
37-
<!-- Build time packages-->
38-
<ItemGroup>
39-
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all" />
40-
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
41-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
42-
</ItemGroup>
43-
44-
<!-- Runtime packages -->
45-
<ItemGroup>
46-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" PrivateAssets="all" />
47-
<PackageReference Include="System.Text.Json" PrivateAssets="all" />
48-
<PackageReference Include="YamlDotNet" PrivateAssets="all" GeneratePathProperty="true" />
49-
<PackageReference Include="YamlDotNet.System.Text.Json" PrivateAssets="all" />
50-
</ItemGroup>
51-
52-
<ItemGroup>
53-
<None Include="$(OutputPath)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
54-
<None Include="$(OutputPath)/System.Text.Json.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
55-
<None Include="$(OutputPath)/YamlDotNet.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
56-
<None Include="$(OutputPath)/YamlDotNet.System.Text.Json.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
57-
<None Include="build/AggregateConfigBuildTask.targets" Pack="true" PackagePath="/build/AggregateConfigBuildTask.targets" />
58-
<None Include="../ThirdPartyNotices.txt" Pack="true" PackagePath="/" />
59-
<None Include="../../LICENSE" Pack="true" PackagePath="/licenses/">
60-
<Link>licenses/LICENSE</Link>
61-
</None>
62-
<None Include="../../README.md" Pack="true" PackagePath="/docs/" />
63-
<None Include="../../image/icon/icon_128.png" Pack="true" PackagePath="/icon.png" />
64-
</ItemGroup>
65-
66-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
6+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
7+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
8+
<SourceLinkCreate>true</SourceLinkCreate>
9+
<NoWarn>NU5100,CA1031,CA1819,CA1027</NoWarn>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
13+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
14+
</PropertyGroup>
15+
16+
<PropertyGroup>
17+
<PackageId>AggregateConfigBuildTask</PackageId>
18+
<Version Condition=" '$(Version)' == '' ">0.0.1</Version>
19+
<Authors>Billy Richardson</Authors>
20+
<Owner>richardsondev</Owner>
21+
<Company>https://richardson.software</Company>
22+
<Description>Merges configuration files at build time, allowing them to be embedded as resources for streamlined deployment and access.</Description>
23+
<PackageTags>yaml, json, arm, build, configuration, msbuild</PackageTags>
24+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
25+
<RepositoryUrl>https://github.com/richardsondev/AggregateConfigBuildTask</RepositoryUrl>
26+
<PackageProjectUrl>https://github.com/richardsondev/AggregateConfigBuildTask</PackageProjectUrl>
27+
<PackageReleaseNotes>https://github.com/richardsondev/AggregateConfigBuildTask/releases/tag/v$(Version)</PackageReleaseNotes>
28+
<PackageReadmeFile>docs/README.md</PackageReadmeFile>
29+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
30+
<IncludeSymbols>true</IncludeSymbols>
31+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
32+
<NoPackageAnalysis>true</NoPackageAnalysis>
33+
<BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
34+
<PackageIcon>icon.png</PackageIcon>
35+
</PropertyGroup>
36+
37+
<!-- Build time packages-->
38+
<ItemGroup>
39+
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="all" />
40+
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
41+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
42+
</ItemGroup>
43+
44+
<!-- Runtime packages -->
45+
<ItemGroup>
46+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" PrivateAssets="all" />
47+
<PackageReference Include="System.IO.Pipelines" PrivateAssets="all" />
48+
<PackageReference Include="System.Text.Encodings.Web" PrivateAssets="all" />
49+
<PackageReference Include="System.Text.Json" PrivateAssets="all" />
50+
<PackageReference Include="YamlDotNet" PrivateAssets="all" GeneratePathProperty="true" />
51+
<PackageReference Include="YamlDotNet.System.Text.Json" PrivateAssets="all" />
52+
</ItemGroup>
53+
54+
<ItemGroup>
55+
<None Include="$(OutputPath)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
56+
<None Include="$(OutputPath)/System.IO.Pipelines.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
57+
<None Include="$(OutputPath)/System.Text.Encodings.Web.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
58+
<None Include="$(OutputPath)/System.Text.Json.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
59+
<None Include="$(OutputPath)/YamlDotNet.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
60+
<None Include="$(OutputPath)/YamlDotNet.System.Text.Json.dll" Pack="true" PackagePath="/tasks/netstandard2.0/" />
61+
<None Include="build/AggregateConfigBuildTask.targets" Pack="true" PackagePath="/build/AggregateConfigBuildTask.targets" />
62+
<None Include="../ThirdPartyNotices.txt" Pack="true" PackagePath="/" />
63+
<None Include="../../LICENSE" Pack="true" PackagePath="/licenses/">
64+
<Link>licenses/LICENSE</Link>
65+
</None>
66+
<None Include="../../README.md" Pack="true" PackagePath="/docs/" />
67+
<None Include="../../image/icon/icon_128.png" Pack="true" PackagePath="/icon.png" />
68+
</ItemGroup>
69+
70+
</Project>

0 commit comments

Comments
 (0)