split data types to new package

Analogy-LogViewer · Aug 29, 2024 · b3ec931 · b3ec931
1 parent fc2d9d9
commit b3ec931
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -57,7 +57,7 @@ jobs:
       uses: actions/[email protected]
       with:
         name: 'artifactory'
-        path: ./Analogy.Interfaces/bin/${{ matrix.configuration }}
+        path: ./
   push-nuget:
     name: 'Push NuGet Packages'
     needs: build
@@ -86,7 +86,6 @@ jobs:
           Get-ChildItem .\artifactory -Filter *.nupkg |
           Where-Object { !$_.Name.Contains('preview') } |
           ForEach-Object { nuget push $_  -Source "GPR" -SkipDuplicate } 
-
 concurrency: 
   group: ${{ github.ref }}
   cancel-in-progress: true
diff --git a/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj b/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj
@@ -6,9 +6,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Analogy.Interfaces.sln b/Analogy.Interfaces.sln
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Analogy.Interfaces.DataTypes", "Analogy.Types\Analogy.Interfaces.DataTypes.csproj", "{FC81D555-312D-41A9-A2A7-AE09AD9F050D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,6 +39,14 @@ Global
 		{4758E0A3-49E4-416A-A79F-AA55DE144F43}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4758E0A3-49E4-416A-A79F-AA55DE144F43}.Release|x86.ActiveCfg = Release|Any CPU
 		{4758E0A3-49E4-416A-A79F-AA55DE144F43}.Release|x86.Build.0 = Release|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|x86.Build.0 = Debug|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|x86.ActiveCfg = Release|Any CPU
+		{FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Analogy.Interfaces/Analogy.Interfaces.csproj b/Analogy.Interfaces/Analogy.Interfaces.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-windows;net7.0-windows;net6.0-windows;net48;net471</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows;net6.0-windows;net48</TargetFrameworks>
+		<UseWindowsForms>true</UseWindowsForms>
 		<Description>Interfaces assembly for creating custom data providers for Analogy Log Viewer</Description>
 		<PackageReleaseNotes></PackageReleaseNotes>
 		<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.Interfaces</PackageProjectUrl>
@@ -27,4 +28,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
 		<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
 	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\Analogy.Types\Analogy.Interfaces.DataTypes.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/Analogy.Types/Analogy.Interfaces.DataTypes.csproj b/Analogy.Types/Analogy.Interfaces.DataTypes.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<Description>Data Types assembly for creating custom data providers for Analogy Log Viewer</Description>
+		<PackageReleaseNotes></PackageReleaseNotes>
+		<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.Interfaces</PackageProjectUrl>
+		<AssemblyName>Analogy.Interfaces.DataTypes</AssemblyName>
+		<RootNamespace>Analogy.Interfaces.DataTypes</RootNamespace>
+		<PackageId>Analogy.Interfaces.DataTypes</PackageId>
+		<VersionPrefix>1.0.0.0</VersionPrefix>
+		<VersionSuffix>1</VersionSuffix>
+		<Authors>Lior Banai</Authors>
+		<Product>Analogy.Interfaces.DataTypes</Product>
+		<Copyright>Lior Banai @ 2024</Copyright>
+		<PackageIcon>icon.png</PackageIcon>
+		<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.Interfaces</RepositoryUrl>
+		<Company>Analogy.LogViewer</Company>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Include="..\icon.png">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
+</Project>
diff --git a/...terfaces/DataTypes/AnalogyColumnFilter.cs → Analogy.Types/AnalogyColumnFilter.cs b/...terfaces/DataTypes/AnalogyColumnFilter.cs → Analogy.Types/AnalogyColumnFilter.cs
diff --git a/...Interfaces/DataTypes/AnalogyColumnInfo.cs → Analogy.Types/AnalogyColumnInfo.cs b/...Interfaces/DataTypes/AnalogyColumnInfo.cs → Analogy.Types/AnalogyColumnInfo.cs
diff --git a/...aces/DataTypes/AnalogyFileReadProgress.cs → Analogy.Types/AnalogyFileReadProgress.cs b/...aces/DataTypes/AnalogyFileReadProgress.cs → Analogy.Types/AnalogyFileReadProgress.cs
diff --git a/...Interfaces/DataTypes/AnalogyLogMessage.cs → Analogy.Types/AnalogyLogMessage.cs b/...Interfaces/DataTypes/AnalogyLogMessage.cs → Analogy.Types/AnalogyLogMessage.cs
diff --git a/...ypes/AnalogyLogMessageUpdaterEventData.cs → ...ypes/AnalogyLogMessageUpdaterEventData.cs b/...ypes/AnalogyLogMessageUpdaterEventData.cs → ...ypes/AnalogyLogMessageUpdaterEventData.cs
diff --git a/...ces/DataTypes/AnalogyPlottingPointData.cs → Analogy.Types/AnalogyPlottingPointData.cs b/...ces/DataTypes/AnalogyPlottingPointData.cs → Analogy.Types/AnalogyPlottingPointData.cs
diff --git a/...rfaces/DataTypes/AnalogyProgressReport.cs → Analogy.Types/AnalogyProgressReport.cs b/...rfaces/DataTypes/AnalogyProgressReport.cs → Analogy.Types/AnalogyProgressReport.cs
diff --git a/Analogy.Interfaces/DataTypes/Enums.cs → Analogy.Types/Enums.cs b/Analogy.Interfaces/DataTypes/Enums.cs → Analogy.Types/Enums.cs
diff --git a/Analogy.Interfaces/DataTypes/EventArgs.cs → Analogy.Types/EventArgs.cs b/Analogy.Interfaces/DataTypes/EventArgs.cs → Analogy.Types/EventArgs.cs
diff --git a/...gy.Interfaces/DataTypes/FilterCriteria.cs → Analogy.Types/FilterCriteria.cs b/...gy.Interfaces/DataTypes/FilterCriteria.cs → Analogy.Types/FilterCriteria.cs
diff --git a/Analogy.Interfaces/IAnalogyLogMessage.cs → Analogy.Types/IAnalogyLogMessage.cs b/Analogy.Interfaces/IAnalogyLogMessage.cs → Analogy.Types/IAnalogyLogMessage.cs
diff --git a/Analogy.Interfaces/ILogParserSettings.cs → Analogy.Types/ILogParserSettings.cs b/Analogy.Interfaces/ILogParserSettings.cs → Analogy.Types/ILogParserSettings.cs
diff --git a/...Interfaces/DataTypes/LogParserSettings.cs → Analogy.Types/LogParserSettings.cs b/...Interfaces/DataTypes/LogParserSettings.cs → Analogy.Types/LogParserSettings.cs
diff --git a/...es/DataTypes/SplitterLogParserSettings.cs → Analogy.Types/SplitterLogParserSettings.cs b/...es/DataTypes/SplitterLogParserSettings.cs → Analogy.Types/SplitterLogParserSettings.cs
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<UseWindowsForms>true</UseWindowsForms>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>True</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -31,11 +30,11 @@
 	</ItemGroup>
 	<!-- Analyzers (Roslyn, Meziantou, StyleCop, ...) -->
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.9.2">
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Meziantou.Analyzer" Version="2.0.152">
+		<PackageReference Include="Meziantou.Analyzer" Version="2.0.163">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -53,7 +52,7 @@
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
 		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-		<PackageReference Include="PolySharp" Version="1.14.0 ">
+		<PackageReference Include="PolySharp" Version="1.14.1 ">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>