Skip to content

Commit 84ff98b

Browse files
authored
Versioning of assemblies match nuget package version (#760)
* Nuget updates * Versioning of assemblies match version of nuget package
1 parent c6635dd commit 84ff98b

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

.github/workflows/push_nuget_manual.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@ jobs:
3535
run: |
3636
sed -i "/ private const string Version = /c\ private const string Version = \"${{ github.event.inputs.tag }}\";" ${{github.workspace}}/src/Runtime/NetDaemon.Runtime/Internal/NetDaemonRuntime.cs
3737
- name: 🎁 Pack AppModel
38-
run: dotnet pack src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
38+
run: dotnet pack src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
3939
- name: 🎁 Pack Client
40-
run: dotnet pack src/Client/NetDaemon.HassClient/NetDaemon.Client.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
40+
run: dotnet pack src/Client/NetDaemon.HassClient/NetDaemon.Client.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
4141
- name: 🎁 Pack Runtime
42-
run: dotnet pack src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
42+
run: dotnet pack src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
4343
- name: 🎁 Pack HassModel
44-
run: dotnet pack src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
44+
run: dotnet pack src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
4545
- name: 🎁 Pack HassModel integration
46-
run: dotnet pack src/HassModel/NetDaemon.HassModel.Integration/NetDaemon.HassModel.Integration.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
46+
run: dotnet pack src/HassModel/NetDaemon.HassModel.Integration/NetDaemon.HassModel.Integration.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
4747
- name: 🎁 Pack HassModel codegen
48-
run: dotnet pack src/HassModel/NetDaemon.HassModel.CodeGenerator/NetDaemon.HassModel.CodeGenerator.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
48+
run: dotnet pack src/HassModel/NetDaemon.HassModel.CodeGenerator/NetDaemon.HassModel.CodeGenerator.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
4949
- name: 🎁 Pack scheduling extensions
50-
run: dotnet pack src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
50+
run: dotnet pack src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
5151
- name: 🎁 Pack logging extensions
52-
run: dotnet pack src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
52+
run: dotnet pack src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
5353
- name: 🎁 Pack TTS extensions
54-
run: dotnet pack src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
54+
run: dotnet pack src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
5555
- name: 🎁 Pack Mqtt extensions
56-
run: dotnet pack src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }}
56+
run: dotnet pack src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj --configuration Release -p:PackageVersion=${{ github.event.inputs.tag }} -p:Version=${{ github.event.inputs.tag }}
5757
- name: 📨 Push to nuget
5858
run: dotnet nuget push **/*.nupkg --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json --no-symbols

.github/workflows/tags_nuget.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ jobs:
3232
run: |
3333
sed -i '/ private const string Version = /c\ private const string Version = "${{ steps.version.outputs.version }}";' ${{github.workspace}}/src/Runtime/NetDaemon.Runtime/Internal/NetDaemonRuntime.cs
3434
- name: 🎁 Pack AppModel
35-
run: dotnet pack src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
35+
run: dotnet pack src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
3636
- name: 🎁 Pack Client
37-
run: dotnet pack src/Client/NetDaemon.HassClient/NetDaemon.Client.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
37+
run: dotnet pack src/Client/NetDaemon.HassClient/NetDaemon.Client.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
3838
- name: 🎁 Pack Runtime
39-
run: dotnet pack src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
39+
run: dotnet pack src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
4040
- name: 🎁 Pack HassModel
41-
run: dotnet pack src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
41+
run: dotnet pack src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
4242
- name: 🎁 Pack HassModel integration
43-
run: dotnet pack src/HassModel/NetDaemon.HassModel.Integration/NetDaemon.HassModel.Integration.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
43+
run: dotnet pack src/HassModel/NetDaemon.HassModel.Integration/NetDaemon.HassModel.Integration.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
4444
- name: 🎁 Pack HassModel codegen
45-
run: dotnet pack src/HassModel/NetDaemon.HassModel.CodeGenerator/NetDaemon.HassModel.CodeGenerator.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
45+
run: dotnet pack src/HassModel/NetDaemon.HassModel.CodeGenerator/NetDaemon.HassModel.CodeGenerator.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
4646
- name: 🎁 Pack scheduling extensions
47-
run: dotnet pack src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
47+
run: dotnet pack src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
4848
- name: 🎁 Pack logging extensions
49-
run: dotnet pack src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
49+
run: dotnet pack src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
5050
- name: 🎁 Pack TTS extensions
51-
run: dotnet pack src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
51+
run: dotnet pack src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
5252
- name: 🎁 Pack Mqtt extensions
53-
run: dotnet pack src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }}
53+
run: dotnet pack src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj --configuration Release -p:PackageVersion=${{ steps.version.outputs.version }} -p:Version=${{ steps.version.outputs.version }}
5454
- name: 📨 Push to nuget
5555
run: dotnet nuget push **/*.nupkg --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json --no-symbols

src/AppModel/NetDaemon.AppModel.Tests/NetDaemon.AppModel.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
1818
<PackageReference Include="System.Reactive" Version="5.0.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
20+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
2121
<PackageReference Include="Moq" Version="4.18.2" />
2222
<PackageReference Include="xunit" Version="2.4.2" />
2323
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
2828
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
2929
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
30-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
30+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
3131
<PackageReference Include="System.Reactive" Version="5.0.0" />
3232
<PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
3333
<PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
3434
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3535
<PrivateAssets>all</PrivateAssets>
3636
</PackageReference>
37-
<PackageReference Include="YamlDotNet" Version="12.0.0" />
37+
<PackageReference Include="YamlDotNet" Version="12.0.1" />
3838
</ItemGroup>
3939
</Project>

src/Client/NetDaemon.HassClient.Tests/NetDaemon.HassClient.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
1313
<PackageReference Include="System.Reactive" Version="5.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1515
<PackageReference Include="Moq" Version="4.18.2" />
1616
<PackageReference Include="xunit" Version="2.4.2" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
2828
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
2929
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
30-
<PackageReference Include="MQTTnet" Version="4.1.0.247" />
31-
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.1.0.247" />
30+
<PackageReference Include="MQTTnet" Version="4.1.1.318" />
31+
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.1.1.318" />
3232
<PackageReference Include="System.Reactive" Version="5.0.0" />
3333
</ItemGroup>
3434

src/Extensions/NetDaemon.Extensions.Scheduling.Tests/NetDaemon.Extensions.Scheduling.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
1818
<PackageReference Include="FluentAssertions" Version="6.7.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
2020
<PackageReference Include="Moq" Version="4.18.2" />
2121
<PackageReference Include="xunit" Version="2.4.2" />
2222
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />

src/HassModel/NetDaemon.HassModel.CodeGenerator/NetDaemon.HassModel.CodeGenerator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
26-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
25+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
2727
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
2828
<PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/HassModel/NetDaemon.HassModel.Tests/NetDaemon.HassModel.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="FluentAssertions" Version="6.7.0" />
1313
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1515
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
1616
<PackageReference Include="Moq" Version="4.18.2" />
1717
<PackageReference Include="xunit" Version="2.4.2" />

src/Runtime/NetDaemon.Runtime.Tests/NetDaemon.Runtime.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
1313
<PackageReference Include="System.Reactive" Version="5.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
15+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
1616
<PackageReference Include="Moq" Version="4.18.2" />
1717
<PackageReference Include="xunit" Version="2.4.2" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

0 commit comments

Comments
 (0)