Skip to content

Commit

Permalink
Updated to version 2.1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
sdietz888 committed Feb 28, 2024
1 parent 7871ebb commit 21c8fbc
Show file tree
Hide file tree
Showing 20 changed files with 68 additions and 88 deletions.
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,27 @@
/MyGeotabAPIAdapter.GeotabObjectMappers/obj
/MyGeotabAPIAdapter.GeotabObjectMappers/bin/Debug/net6.0
/MyGeotabAPIAdapter.GeotabObjectMappers/bin/Release/net6.0
/MyGeotabAPIAdapter/bin/Debug/net8.0
/MyGeotabAPIAdapter.Configuration/bin/Debug/net8.0
/MyGeotabAPIAdapter.Database/bin/Debug/net8.0
/MyGeotabAPIAdapter.Database.EntityPersisters/bin/Debug/net8.0
/MyGeotabAPIAdapter.DataOptimizer/bin/Debug/net8.0
/MyGeotabAPIAdapter.Exceptions/bin/Debug/net8.0
/MyGeotabAPIAdapter.Geospatial/bin/Debug/net8.0
/MyGeotabAPIAdapter.GeotabObjectMappers/bin/Debug/net8.0
/MyGeotabAPIAdapter.Helpers/bin/Debug/net8.0
/MyGeotabAPIAdapter.Logging/bin/Debug/net8.0
/MyGeotabAPIAdapter.MyGeotabAPI/bin/Debug/net8.0
/MyGeotabAPIAdapter.Tests/bin/Debug/net8.0
/MyGeotabAPIAdapter/bin/Release/net8.0
/MyGeotabAPIAdapter.Configuration/bin/Release/net8.0
/MyGeotabAPIAdapter.Database/bin/Release/net8.0
/MyGeotabAPIAdapter.Database.EntityPersisters/bin/Release/net8.0
/MyGeotabAPIAdapter.DataOptimizer/bin/Release/net8.0
/MyGeotabAPIAdapter.Exceptions/bin/Release/net8.0
/MyGeotabAPIAdapter.Geospatial/bin/Release/net8.0
/MyGeotabAPIAdapter.GeotabObjectMappers/bin/Release/net8.0
/MyGeotabAPIAdapter.Helpers/bin/Release/net8.0
/MyGeotabAPIAdapter.Logging/bin/Release/net8.0
/MyGeotabAPIAdapter.MyGeotabAPI/bin/Release/net8.0
/MyGeotabAPIAdapter.Tests/bin/Release/net8.0
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<UserSecretsId>dotnet-MyGeotabAPIAdapter.DataOptimizer-869D4350-5E76-4BAE-AC1D-08B82AF48ECA</UserSecretsId>
<Authors>Geotab Inc.</Authors>
<Company>Geotab Inc.</Company>
<Product>MyGeotab API Adapter - DataOptimizer</Product>
<AssemblyVersion>2.1.2</AssemblyVersion>
<FileVersion>2.1.2</FileVersion>
<RuntimeIdentifiers>win-x64;ubuntu.20.04-x64</RuntimeIdentifiers>
<AssemblyVersion>2.1.3</AssemblyVersion>
<FileVersion>2.1.3</FileVersion>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
<Description>A worker service designed to migrate data from the MyGeotab API Adapter database into another set of tables that are optimized for use by applications and data analysis tools. Additional columns are added to some of the tables and these are populated via interpolation or other query-based procedues.</Description>
</PropertyGroup>

<ItemGroup>
<None Remove="LOG-MyGeotab_API_Adapter-Data_Optimizer-internal.log" />
</ItemGroup>

<ItemGroup>
<_WebToolingArtifacts Remove="Properties\PublishProfiles\MyGeotabAPIAdapter.DataOptimizer_Release_SCD_Target_ubuntu-x64.pubxml" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\publish\MyGeotabAPIAdapter.DataOptimizer_SCD_linux-x64</PublishDir>
<PublishDir>bin\Release\net8.0\publish\MyGeotabAPIAdapter.DataOptimizer_SCD_linux-x64</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\publish\MyGeotabAPIAdapter.DataOptimizer_SCD_win-x64</PublishDir>
<PublishDir>bin\Release\net8.0\publish\MyGeotabAPIAdapter.DataOptimizer_SCD_win-x64</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Authors>Geotab Inc.</Authors>
<Product>MyGeotab API Adapter</Product>
</PropertyGroup>
Expand All @@ -10,9 +10,9 @@
<PackageReference Include="Dapper" Version="2.1.28" />
<PackageReference Include="FastMember" Version="1.5.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.8.14" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.9.28" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="Npgsql" Version="8.0.2" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.130" />
<PackageReference Include="Polly" Version="8.3.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

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

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

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

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.6.171" />
<PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.7.179" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

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

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

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

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

<ItemGroup>
<PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.6.171" />
<PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.7.179" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
<PackageReference Include="Polly" Version="8.3.0" />
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions MyGeotabAPIAdapter.Tests/MyGeotabAPIAdapter.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<IsPackable>false</IsPackable>

Expand Down Expand Up @@ -32,16 +32,16 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.130" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.console" Version="2.6.6">
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.console" Version="2.7.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 5 additions & 9 deletions MyGeotabAPIAdapter/MyGeotabAPIAdapter.csproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Configurations>Debug;Release</Configurations>
<UserSecretsId>dotnet-MyGeotabAPIAdapter-647298B6-D50F-498C-A6D9-8910D78DFF6D</UserSecretsId>
<RootNamespace>MyGeotabAPIAdapter</RootNamespace>
<Authors>Geotab Inc.</Authors>
<Product>MyGeotab API Adapter</Product>
<Description>A .NET Core (C#) Worker Service designed to use the MyGeotab .NET API and serve as a broker between a MyGeotab database and an associated "Virtual Geotab Database". Intended for use when direct utilization of the MyGeotab SDK is not an option. Modify as required to meet individual solution objectives.</Description>
<Copyright></Copyright>
<Version>2.1.2</Version>
<InformationalVersion>2.1.2</InformationalVersion>
<RuntimeIdentifiers>win-x64;ubuntu.20.04-x64</RuntimeIdentifiers>
<Version>2.1.3</Version>
<InformationalVersion>2.1.3</InformationalVersion>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
<None Remove="LOG-MyGeotabAPIAdapter-internal.log" />
<None Remove="Program - Copy.cs.bak" />
</ItemGroup>

<ItemGroup>
<_WebToolingArtifacts Remove="Properties\PublishProfiles\MyGeotabAPIAdapter_Release_SCD_Target_ubuntu-x64.pubxml" />
</ItemGroup>

<ItemGroup>
<None Include="..\.editorconfig" Link=".editorconfig" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.6.171" />
<PackageReference Include="Geotab.Checkmate.ObjectModel" Version="11.7.179" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<TargetFramework>net6.0</TargetFramework>
<PublishDir>bin\Release\net6.0\publish\MyGeotabAPIAdapter_SCD_linux-x64</PublishDir>
<TargetFramework>net8.0</TargetFramework>
<PublishDir>bin\Release\net8.0\publish\MyGeotabAPIAdapter_SCD_linux-x64</PublishDir>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishProtocol>FileSystem</PublishProtocol>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<TargetFramework>net6.0</TargetFramework>
<PublishDir>bin\Release\net6.0\publish\MyGeotabAPIAdapter_SCD_win-x64</PublishDir>
<TargetFramework>net8.0</TargetFramework>
<PublishDir>bin\Release\net8.0\publish\MyGeotabAPIAdapter_SCD_win-x64</PublishDir>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
Expand Down
Loading

0 comments on commit 21c8fbc

Please sign in to comment.