Skip to content

Commit

Permalink
Updated to .NET8 / Updated Newtonsoft.Json to 13.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
cBashTN committed Jun 19, 2024
1 parent 90a0542 commit c4869fa
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 106 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>

<TargetFramework>netstandard2.1;net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
Expand All @@ -16,9 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DeviceConfigurationToGsmCommunication\DeviceConfigurationToGsmCommunication.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<Version>1.0.272-alpha</Version>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<Version>3.24.0</Version>
<Company>KELLER Druckmesstechnik AG</Company>
<Authors>KELLER Druckmesstechnik AG</Authors>
<Copyright>Copyright 2022 (c) KELLER Pressure AG. All rights reserved.</Copyright>
<RepositoryUrl>https://github.com/KELLERAGfuerDruckmesstechnik/KellerAg.Shared.IoT.Converters</RepositoryUrl>
<PackageProjectUrl>https://docs.kolibricloud.ch/sending-technology/converter-library</PackageProjectUrl>
<PackageProjectUrl>https://docs.pressuresuite.com/sending-technology/converter-library</PackageProjectUrl>
<Description>Used by KellerAg.Shared.IoT.Converters</Description>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\KellerAg.Shared.Entities\KellerAg.Shared.Entities.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<Version>1.0.272-alpha</Version>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<Version>3.24.0</Version>
<Company>KELLER Druckmesstechnik AG</Company>
<Authors>Sebastian Mojado</Authors>
<Copyright>Copyright 2022 (c) KELLER Pressure AG. All rights reserved.</Copyright>
<Description>Used by KellerAg.Shared.IoT.Converters</Description>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\KellerAg.Shared.Entities\KellerAg.Shared.Entities.csproj" />
<ProjectReference Include="..\KellerAg.Shared.LoRaPayloadConverter\KellerAg.Shared.LoRaPayloadConverter.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy">
<Version>6.2.1</Version>
Expand All @@ -13,9 +11,6 @@
<Version>5.10.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="xunit.core">
<Version>2.4.2</Version>
</PackageReference>
Expand All @@ -24,10 +19,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\GsmCommunicationToJson\GsmCommunicationToJson.csproj" />
</ItemGroup>

</Project>
28 changes: 12 additions & 16 deletions Source/GsmCommunicationToJson/GsmCommunicationToJson.csproj
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<!-- The identifier that must be unique within the hosting gallery -->
<PackageId>KellerAg.Cloud.GsmCommunicationToJson</PackageId>
<!-- The package version number that is used when resolving dependencies -->
<PackageVersion>1.0.42.0</PackageVersion>
<PackageVersion>3.24.0.0</PackageVersion>
<!-- Authors contain text that appears directly on the gallery -->
<authors>Sebastian Mojado</authors>
<!-- The description can be used in package manager UI. Note that the nuget.org gallery uses information you add in the portal. -->
<Description>This library is used to convert Messages in the Keller AG GSM/ARC format to JSON.</Description>
<Description>This library is used to convert messages in the KELLER AG GSM/ARC format to JSON.</Description>
<!-- If true, this value prompts the user to accept the license when installing the package. -->
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes></PackageReleaseNotes>
<Copyright>Copyright 2020 (c) Keller AG. All rights reserved.</Copyright>
<PackageTags></PackageTags>
<PackageReleaseNotes>
</PackageReleaseNotes>
<PackageTags>
</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<!-- this hack (which generates warnings) is required for the variable $(TargetDir) to work in the post build event -->
<!-- see https://github.com/dotnet/project-system/issues/1569 -->
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

<PropertyGroup>
<Product>KellerAg.Cloud.GsmCommunicationToJson</Product>
<Version>1.0.272-alpha</Version>
<AssemblyVersion>1.0.272.0</AssemblyVersion>
<FileVersion>1.0.272.0</FileVersion>
<Product>KellerAg.Cloud.GsmCommunicationToJson</Product>
<Version>3.24.0</Version>
<AssemblyVersion>3.24.0.0</AssemblyVersion>
<FileVersion>3.24.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>

<TargetFrameworks>net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FakeItEasy" Version="6.2.1" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
Expand All @@ -19,9 +16,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\JsonToBusinessObjects\JsonToBusinessObjects.csproj" />
</ItemGroup>

</Project>
</Project>
25 changes: 8 additions & 17 deletions Source/JsonToBusinessObjects/JsonToBusinessObjects.csproj
Original file line number Diff line number Diff line change
@@ -1,45 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<!-- The identifier that must be unique within the hosting gallery -->
<PackageId>KellerAg.Cloud.JsonToBusinessObjects</PackageId>
<!-- The package version number that is used when resolving dependencies -->
<PackageVersion>2.0.9.23</PackageVersion>
<PackageVersion>3.24.0.0</PackageVersion>
<!-- Authors contain text that appears directly on the gallery -->
<authors>KELLER Druckmesstechnik AG</authors>
<!-- The description can be used in package manager UI. Note that the nuget.org gallery uses information you add in the portal. -->
<Description>This library is used to convert KELLER messages from JSON to an Object with improved data handling.</Description>
<!-- If true, this value prompts the user to accept the license when installing the package. -->
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes></PackageReleaseNotes>
<Copyright>Copyright 2022 (c) KELLER Pressure AG. All rights reserved.</Copyright>
<PackageReleaseNotes>
</PackageReleaseNotes>
<PackageTags>converter json object</PackageTags>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>

<!-- this hack (which generates warnings) is required for the variable $(TargetDir) to work in the post build event -->
<!-- see https://github.com/dotnet/project-system/issues/1569 -->
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

<PropertyGroup>
<Product>KellerAg.Cloud.JsonToBusinessObjects</Product>
<Company>KELLER AG</Company>
<Version>2.0.272-alpha</Version>
<Version>3.24.0</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath />
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<ProjectReference Include="..\KellerAg.Shared.LoRaPayloadConverter\KellerAg.Shared.LoRaPayloadConverter.csproj" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\KellerAg.Shared.LoRaPayloadConverter\KellerAg.Shared.LoRaPayloadConverter.csproj" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\KellerAg.Shared.LoRaPayloadConverter\KellerAg.Shared.LoRaPayloadConverter.csproj" />
</ItemGroup>

</Project>
</Project>
11 changes: 2 additions & 9 deletions Source/KellerAg.Shared.Entities/KellerAg.Shared.Entities.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<Company>KELLER Druckmesstechnik AG</Company>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://docs.kolibricloud.ch/sending-technology/converter-library</PackageProjectUrl>
<RepositoryUrl>https://github.com/KELLERAGfuerDruckmesstechnik/KellerAg.Shared.IoT.Converters</RepositoryUrl>
<PackageTags>KELLER, KELLER Pressure, Druckmesstechnik, Pressure, pressure sensors, KOLIBRI cloud, LoRaWAN, LoRa, Loriot.io, Actility, TTN</PackageTags>
<PackageTags>KELLER, KELLER Pressure, Druckmesstechnik, Pressure, pressure sensors, PressureSuite Cloud, LoRaWAN, LoRa, Loriot.io, Actility, TTN</PackageTags>
<Authors>Sebastian Mojado</Authors>
<Copyright>2022</Copyright>
<Description>KELLER AG Entities for various purposes.</Description>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NodaTime" Version="2.4.18" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="TimeZoneConverter" Version="3.2.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>

<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\KellerAg.Shared.IoT.Converters\KellerAg.Shared.IoT.Converters.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<LangVersion>8.0</LangVersion>
<Version>1.0.272-alpha</Version>
<AssemblyVersion>1.0.272.0</AssemblyVersion>
<Version>3.24.0</Version>
<AssemblyVersion>3.24.0.0</AssemblyVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>KELLER Druckmesstechnik AG</Authors>
<Company>KELLER Druckmesstechnik AG</Company>
<Product>KellerAg.Shared.LoRaPayloadConverter</Product>
<Description>Used by KellerAg.Shared.IoT.Converters
- Converts the LoRa Payload from TTN, Actility or Loriot to a understandable format</Description>
<Copyright>Copyright 2022 (c) KELLER AG. All rights reserved.</Copyright>
- Converts the LoRa Payload from TTN, Actility or Loriot to a understandable format</Description>
<PackageTags>LoRa converter json object</PackageTags>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>

<ItemGroup>
<Compile Remove="documentation\**" />
<Compile Remove="Dto\**" />
Expand All @@ -24,9 +21,7 @@
<None Remove="documentation\**" />
<None Remove="Dto\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
</Project>

0 comments on commit c4869fa

Please sign in to comment.