Skip to content

Commit ebd9f18

Browse files
ChristopherMannChristopherMann
authored
Bump dependencies (#19)
* Bump dependencies * Fix breaking changes in YamlDotNet
1 parent 71438b9 commit ebd9f18

11 files changed

Lines changed: 38 additions & 90 deletions

File tree

‎src/CloudInit.ConfigDrive.Abstractions/CloudInit.ConfigDrive.Abstractions.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@
66
<RootNamespace>Dbosoft.CloudInit.ConfigDrive</RootNamespace>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
9+
910
<ItemGroup>
10-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
1512
</ItemGroup>
13+
1614
<ItemGroup>
1715
<ProjectReference Include="..\CloudInit.ConfigDrive.Primitives\CloudInit.ConfigDrive.Primitives.csproj" />
1816
</ItemGroup>
19-
<ItemGroup>
20-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
21-
</ItemGroup>
2217

2318
</Project>

‎src/CloudInit.ConfigDrive.Core/CloudInit.ConfigDrive.Core.csproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
16-
<PackageReference Include="YamlDotNet" Version="11.2.1" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
12+
<PackageReference Include="YamlDotNet" Version="16.3.0" />
1713
</ItemGroup>
1814

1915
<ItemGroup>
2016
<ProjectReference Include="..\CloudInit.ConfigDrive.Abstractions\CloudInit.ConfigDrive.Abstractions.csproj" />
2117
</ItemGroup>
2218

23-
<ItemGroup>
24-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
25-
</ItemGroup>
26-
2719
</Project>

‎src/CloudInit.ConfigDrive.Core/YamlSerializer.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,19 @@ public bool Accepts(Type type)
3232
return typeof(NetworkData) == type;
3333
}
3434

35-
public object? ReadYaml(IParser parser, Type type)
35+
public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
3636
{
3737
throw new NotImplementedException();
3838
}
3939

40-
public void WriteYaml(IEmitter emitter, object? value, Type type)
40+
public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
4141
{
4242
var networkData = value as NetworkData;
4343

4444
if (networkData == null)
4545
return;
4646

47-
//var envelope = new NetworkDataEnvelope();
48-
NetworkWithVersion? output = null;
47+
NetworkWithVersion? output;
4948

5049
switch (networkData.Format)
5150
{
@@ -86,10 +85,8 @@ public void WriteYaml(IEmitter emitter, object? value, Type type)
8685
default:
8786
throw new ArgumentOutOfRangeException();
8887
}
89-
90-
if (output == null) return;
91-
var serializer = new SerializerBuilder().BuildValueSerializer();
92-
serializer.SerializeValue(emitter, output, output.GetType());
88+
89+
serializer(output, output.GetType());
9390
}
9491

9592
private class NetworkWithVersion

‎src/CloudInit.ConfigDrive.NoCloud/CloudInit.ConfigDrive.NoCloud.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
1612
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
1713
</ItemGroup>
1814

1915
<ItemGroup>
2016
<ProjectReference Include="..\CloudInit.ConfigDrive.Core\CloudInit.ConfigDrive.Core.csproj" />
2117
</ItemGroup>
2218

23-
<ItemGroup>
24-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
25-
</ItemGroup>
26-
2719
</Project>

‎src/CloudInit.ConfigDrive.Primitives/CloudInit.ConfigDrive.Primitives.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
2012
</ItemGroup>
2113

2214
</Project>

‎src/CloudInit.ConfigDrive.WindowsImaging/CloudInit.ConfigDrive.WindowsImaging.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,11 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
1612
</ItemGroup>
1713

1814
<ItemGroup>
1915
<ProjectReference Include="..\CloudInit.ConfigDrive.Abstractions\CloudInit.ConfigDrive.Abstractions.csproj" />
2016
</ItemGroup>
2117

22-
<ItemGroup>
23-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
24-
</ItemGroup>
25-
2618
</Project>

‎src/CloudInit.ConfigDrive/CloudInit.ConfigDrive.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
21-
</ItemGroup>
22-
23-
<ItemGroup>
24-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
16+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
2517
</ItemGroup>
2618

2719
</Project>

‎src/Directory.Build.props‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1-
21
<Project>
32
<PropertyGroup>
43
<PackageOutputPath>..\..\build-packages</PackageOutputPath>
54
<PackageLicenseExpression>MIT</PackageLicenseExpression>
65
<PackageProjectUrl>https://github.com/dbosoft/CloudInit.ConfigDrive</PackageProjectUrl>
6+
<PackageReleaseNotes>https://github.com/dbosoft/CloudInit.ConfigDrive/releases</PackageReleaseNotes>
77
<Copyright>Copyright (c) dbosoft GmbH. All rights reserved.</Copyright>
88
<Authors>dbosoft</Authors>
99
<Company>dbosoft GmbH</Company>
1010
<Product>CloudInit.ConfigDrive</Product>
1111
<RepositoryUrl>https://github.com/dbosoft/CloudInit.ConfigDrive</RepositoryUrl>
12+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1213
<EmbedUntrackedSources>true</EmbedUntrackedSources>
13-
<DebugType>embedded</DebugType>
14+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
1415
</PropertyGroup>
1516

16-
17-
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
18-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
17+
<PropertyGroup>
18+
<ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">True</ContinuousIntegrationBuild>
19+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">True</ContinuousIntegrationBuild>
1920
</PropertyGroup>
2021

2122
<ItemGroup>
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
23+
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
24+
<PrivateAssets>all</PrivateAssets>
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26+
</PackageReference>
27+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
2328
</ItemGroup>
2429
</Project>
25-

‎src/GenConfigDrive/GenConfigDrive.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net8.0-windows</TargetFramework>
66
<RootNamespace>Dbosoft.CloudInit.ConfigDrive</RootNamespace>
77
<AssemblyName>cloud-init-cd</AssemblyName>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="CommandLineParser" Version="2.8.0" />
13-
<PackageReference Include="GitVersion.MsBuild" Version="5.9.0">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
16-
</PackageReference>
17-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
12+
<PackageReference Include="CommandLineParser" Version="2.9.1" />
13+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
1814
</ItemGroup>
1915

2016
<ItemGroup>
@@ -23,8 +19,4 @@
2319
<ProjectReference Include="..\CloudInit.ConfigDrive\CloudInit.ConfigDrive.csproj" />
2420
</ItemGroup>
2521

26-
<ItemGroup>
27-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
28-
</ItemGroup>
29-
3022
</Project>

‎test/CloudInit.ConfigDrive.Core.Test/CloudInit.ConfigDrive.Core.Test.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
10-
<PackageReference Include="Moq" Version="4.16.1" />
11-
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
10+
<PackageReference Include="Moq" Version="4.20.72" />
11+
<PackageReference Include="xunit" Version="2.9.3" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="3.0.3">
16+
<PackageReference Include="coverlet.collector" Version="6.0.3">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>

0 commit comments

Comments
 (0)